diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2008-10-23 01:47:34 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2008-10-23 01:47:34 +0200 |
commit | eb9910894d7857c273e049b297fd6251e5ecc43e (patch) | |
tree | 296ffbceed469ec42ae7107c1b9ce7356f05eeb0 /drivers/hid/usbhid | |
parent | 0f2c5945a917e776ccd394f0e1924e9502c2795f (diff) | |
download | op-kernel-dev-eb9910894d7857c273e049b297fd6251e5ecc43e.zip op-kernel-dev-eb9910894d7857c273e049b297fd6251e5ecc43e.tar.gz |
HID: fix lock imbalance in hiddev
Don't forget to unlock_kernel() in hiddev_ioctl_usage().
Added in 7961df16819085b8a357720d89d0239036e6af2a
(HID: Switch hiddev to unlocked_ioctl).
Corresponing sparse warning:
drivers/hid/usbhid/hiddev.c:515:10: warning: context imbalance in 'hiddev_ioctl_usage': wrong count at exit
drivers/hid/usbhid/hiddev.c:515:10: context 'kernel_lock': wanted 0, got 1
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/usbhid')
-rw-r--r-- | drivers/hid/usbhid/hiddev.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c index babd65d..3ac3207 100644 --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c @@ -436,8 +436,7 @@ static noinline int hiddev_ioctl_usage(struct hiddev *hiddev, unsigned int cmd, if (copy_to_user(user_arg, uref, sizeof(*uref))) goto fault; - kfree(uref_multi); - return 0; + goto goodreturn; default: if (cmd != HIDIOCGUSAGE && |