diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2009-06-19 23:24:11 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-07-30 16:06:05 -0700 |
| commit | 062ca00319a240aed40c341a12ce75429f99cfee (patch) | |
| tree | a0e985d03664f8ad210796cc58cf19596348d81e | |
| parent | 1e6b7c85d1cc4c3125522b50d7f23abf45441939 (diff) | |
HID: hiddev, fix lock imbalance
commit 4859484b0957ddc7fe3e0fa349d98b0f1c7876bd upstream.
Add omitted BKL to one switch/case.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/hid/usbhid/hiddev.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c index 842e9edb888e..993772c6f1f2 100644 --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c @@ -484,8 +484,10 @@ static noinline int hiddev_ioctl_usage(struct hiddev *hiddev, unsigned int cmd, goto goodreturn; case HIDIOCGCOLLECTIONINDEX: + i = field->usage[uref->usage_index].collection_index; + unlock_kernel(); kfree(uref_multi); - return field->usage[uref->usage_index].collection_index; + return i; case HIDIOCGUSAGES: for (i = 0; i < uref_multi->num_values; i++) uref_multi->values[i] = |