diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-04 20:36:14 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-04 20:36:14 -0400 |
commit | 5b146f7e016a8727a98b3d48e4f4e128d3624cd5 (patch) | |
tree | 308acba9e7fdb00ab1458ebacd25dd049e310996 /drivers/hid/hidraw.c | |
parent | 626f090c5cbbe557379978c7a9525011ad7fbbf6 (diff) | |
parent | c095ba7224d8edc71dcef0d655911399a8bd4a3f (diff) |
Merge 3.11-rc4 into usb-next
We want those fixes in here also.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hid/hidraw.c')
-rw-r--r-- | drivers/hid/hidraw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c index a7451632ceb4..6f1feb2c2e97 100644 --- a/drivers/hid/hidraw.c +++ b/drivers/hid/hidraw.c | |||
@@ -518,7 +518,6 @@ int hidraw_connect(struct hid_device *hid) | |||
518 | goto out; | 518 | goto out; |
519 | } | 519 | } |
520 | 520 | ||
521 | mutex_unlock(&minors_lock); | ||
522 | init_waitqueue_head(&dev->wait); | 521 | init_waitqueue_head(&dev->wait); |
523 | INIT_LIST_HEAD(&dev->list); | 522 | INIT_LIST_HEAD(&dev->list); |
524 | 523 | ||
@@ -528,6 +527,7 @@ int hidraw_connect(struct hid_device *hid) | |||
528 | dev->exist = 1; | 527 | dev->exist = 1; |
529 | hid->hidraw = dev; | 528 | hid->hidraw = dev; |
530 | 529 | ||
530 | mutex_unlock(&minors_lock); | ||
531 | out: | 531 | out: |
532 | return result; | 532 | return result; |
533 | 533 | ||