| From 4859484b0957ddc7fe3e0fa349d98b0f1c7876bd Mon Sep 17 00:00:00 2001 |
| From: Jiri Slaby <jirislaby@gmail.com> |
| Date: Fri, 19 Jun 2009 23:24:11 +0200 |
| Subject: HID: hiddev, fix lock imbalance |
| |
| From: Jiri Slaby <jirislaby@gmail.com> |
| |
| 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> |
| |
| --- |
| drivers/hid/usbhid/hiddev.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/hid/usbhid/hiddev.c |
| +++ b/drivers/hid/usbhid/hiddev.c |
| @@ -527,8 +527,10 @@ static noinline int hiddev_ioctl_usage(s |
| 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] = |
