From d5a213a0c5464321fe1c0f70518f8f0e14dbff1d Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Tue, 1 Jun 2010 23:04:44 +0200 Subject: [PATCH] --- yaml --- r: 207974 b: refs/heads/master c: 1548b13b75a2ec06f46220004e91c37818be6c18 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/f_fs.c | 2 -- trunk/drivers/usb/gadget/inode.c | 6 ++---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 209a805894b8..df3b8b63c374 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 00b81fb23a4937a24cb010f41ac173a786eb4c55 +refs/heads/master: 1548b13b75a2ec06f46220004e91c37818be6c18 diff --git a/trunk/drivers/usb/gadget/f_fs.c b/trunk/drivers/usb/gadget/f_fs.c index 2aaa0f75c6cf..c51c21314076 100644 --- a/trunk/drivers/usb/gadget/f_fs.c +++ b/trunk/drivers/usb/gadget/f_fs.c @@ -714,9 +714,7 @@ static long ffs_ep0_ioctl(struct file *file, unsigned code, unsigned long value) struct ffs_function *func = ffs->func; ret = func ? ffs_func_revmap_intf(func, value) : -ENODEV; } else if (gadget->ops->ioctl) { - lock_kernel(); ret = gadget->ops->ioctl(gadget, code, value); - unlock_kernel(); } else { ret = -ENOTTY; } diff --git a/trunk/drivers/usb/gadget/inode.c b/trunk/drivers/usb/gadget/inode.c index 63fc171c0ed9..fc35406fc80c 100644 --- a/trunk/drivers/usb/gadget/inode.c +++ b/trunk/drivers/usb/gadget/inode.c @@ -1299,11 +1299,9 @@ static long dev_ioctl (struct file *fd, unsigned code, unsigned long value) struct usb_gadget *gadget = dev->gadget; long ret = -ENOTTY; - if (gadget->ops->ioctl) { - lock_kernel(); + if (gadget->ops->ioctl) ret = gadget->ops->ioctl (gadget, code, value); - unlock_kernel(); - } + return ret; }