Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 777da590 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[PATCH] USB: usbdevfs_ioctl 32bit fix 



drivers/usb/core/devio.c: In function `proc_ioctl_compat':
drivers/usb/core/devio.c:1401: warning: passing arg 1 of `compat_ptr' makes integer from pointer without a cast

NFI if this is correct...

Cc: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent bc7cb323

drivers/usb/core/devio.c

+2 −2
Original line number Diff line number Diff line
@@ -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