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 14:39:32 -0700 |
| commit | 99881939eeede1a08dcec3c8ea9a4bc046736554 (patch) | |
| tree | 84814d5e29d26f8fa5ee35cad52b007b1c55b3d6 | |
| parent | 3db6ff5f188bc0277d26ee2e91e7354efe97560c (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 e9b436d2d94..39e27f4be4a 100644 --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c @@ -527,8 +527,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] = |