From c3fd217c03adf780d9bbd7c71295dcdd5043eb2a Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Thu, 17 Nov 2005 09:47:02 -0800 Subject: [PATCH] --- yaml --- r: 14355 b: refs/heads/master c: 777da5905e82695d1dd73eee6cfe50bd486d8fe9 h: refs/heads/master i: 14353: e3d6c57e8046e646612781519d36ab9ddad6e0cc 14351: 319e163ddc6057dec9aa5183dfced5f3e52369f7 v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/devio.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ae99a8811247..38ae379a41bd 100644 --- 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 index 942cd437dc48..ec138852848b 100644 --- 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