diff --git a/[refs] b/[refs] index 684f4f407c12..4411fc256495 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d23b536bb715673ca0ccbdaac2b6ce2c001d06e9 +refs/heads/master: 058120d70ebb430e27ad55871429028361c5baed diff --git a/trunk/drivers/usb/core/devio.c b/trunk/drivers/usb/core/devio.c index ec138852848b..b1d6e9af732d 100644 --- a/trunk/drivers/usb/core/devio.c +++ b/trunk/drivers/usb/core/devio.c @@ -1398,7 +1398,7 @@ static int proc_ioctl_compat(struct dev_state *ps, compat_uptr_t arg) 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))