---

yaml --- r: 14355 b: refs/heads/master c: 777da59 h: refs/heads/master i: 14353: e3d6c57 14351: 319e163 v: v3
git-mirror · Nov 17, 2005 · c3fd217 · c3fd217
1 parent bb4be1e
commit c3fd217
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc7cb323bab717660830211d50555dedf19e372e
+refs/heads/master: 777da5905e82695d1dd73eee6cfe50bd486d8fe9
diff --git a/trunk/drivers/usb/core/devio.c b/trunk/drivers/usb/core/devio.c
@@ -1392,7 +1392,7 @@ 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;
@@ -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