Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 942cd437dc48..b1d6e9af732d 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -1392,13 +1392,13 @@ static int proc_ioctl_default(struct dev_state *ps, void __user *arg)
 }
 
 #ifdef CONFIG_COMPAT
-static int proc_ioctl_compat(struct dev_state *ps, void __user *arg)
+static int proc_ioctl_compat(struct dev_state *ps, compat_uptr_t arg)
 {
         struct usbdevfs_ioctl32 __user *uioc;
         struct usbdevfs_ioctl ctrl;
         u32 udata;
 
-        uioc = compat_ptr(arg);
+        uioc = compat_ptr((long)arg);
         if (get_user(ctrl.ifno, &uioc->ifno) ||
             get_user(ctrl.ioctl_code, &uioc->ioctl_code) ||
             __get_user(udata, &uioc->data))
@@ -1511,7 +1511,7 @@ static int usbdev_ioctl(struct inode *inode, struct file *file, unsigned int cmd
 
         case USBDEVFS_IOCTL32:
                 snoop(&dev->dev, "%s: IOCTL\n", __FUNCTION__);
-                ret = proc_ioctl_compat(ps, p);
+                ret = proc_ioctl_compat(ps, (compat_uptr_t)(long)p);
                 break;
 #endif