patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / atm / uPD98402.c

diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
index 0bc05c9..da33ead 100644 (file)
--- a/drivers/atm/uPD98402.c
+++ b/drivers/atm/uPD98402.c
@@ -37,7 +37,7 @@ struct uPD98402_priv {
 #define GET(reg) dev->ops->phy_get(dev,uPD98402_##reg)
 
 
-static int fetch_stats(struct atm_dev *dev,struct sonet_stats *arg,int zero)
+static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int zero)
 {
        struct sonet_stats tmp;
        int error = 0;
@@ -83,7 +83,7 @@ static int set_framing(struct atm_dev *dev,unsigned char framing)
 }
 
 
-static int get_sense(struct atm_dev *dev,u8 *arg)
+static int get_sense(struct atm_dev *dev,u8 __user *arg)
 {
        unsigned long flags;
        unsigned char s[3];
@@ -132,29 +132,28 @@ static int set_loopback(struct atm_dev *dev,int mode)
 }
 
 
-static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void *arg)
+static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
 {
        switch (cmd) {
 
                case SONET_GETSTATZ:
                 case SONET_GETSTAT:
-                       return fetch_stats(dev,(struct sonet_stats *) arg,
-                           cmd == SONET_GETSTATZ);
+                       return fetch_stats(dev,arg, cmd == SONET_GETSTATZ);
                case SONET_SETFRAMING:
                        return set_framing(dev,(int) (long) arg);
                case SONET_GETFRAMING:
-                       return put_user(PRIV(dev)->framing,(int *) arg) ?
+                       return put_user(PRIV(dev)->framing,(int __user *)arg) ?
                            -EFAULT : 0;
                case SONET_GETFRSENSE:
                        return get_sense(dev,arg);
                case ATM_SETLOOP:
                        return set_loopback(dev,(int) (long) arg);
                case ATM_GETLOOP:
-                       return put_user(PRIV(dev)->loop_mode,(int *) arg) ?
+                       return put_user(PRIV(dev)->loop_mode,(int __user *)arg) ?
                            -EFAULT : 0;
                case ATM_QUERYLOOP:
                        return put_user(ATM_LM_LOC_PHY | ATM_LM_LOC_ATM |
-                           ATM_LM_RMT_PHY,(int *) arg) ? -EFAULT : 0;
+                           ATM_LM_RMT_PHY,(int __user *)arg) ? -EFAULT : 0;
                default:
                        return -ENOIOCTLCMD;
        }