diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-02 14:22:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-02 14:22:15 -0700 |
| commit | f9ed432c929f005110c23eb00702265fc4c08e66 (patch) | |
| tree | 060e6787d0fe75c3a65827aaa9d51620cc3b6df7 /drivers/hid/hidraw.c | |
| parent | 940e84fc2681d5265a602a287e0204569ca215fa (diff) | |
| parent | e6dfb04360bb265c2e931316369c877b3bb7159c (diff) | |
| download | kernel_replicant_linux-f9ed432c929f005110c23eb00702265fc4c08e66.tar.gz kernel_replicant_linux-f9ed432c929f005110c23eb00702265fc4c08e66.tar.bz2 kernel_replicant_linux-f9ed432c929f005110c23eb00702265fc4c08e66.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:
- fix hid-sony PS3 sixaxxis breakage from Benjamin Tissories
- fix hidraw race condition from Yonghua Zheng
- fix/bandaid for rare device enumeration problems of Logitech Unifying
receivers from Nestor Lopez Casado
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: hidraw: fix improper mutex release
HID: sony: fix HID mapping for PS3 sixaxis controller
HID: hid-logitech-dj: querying_devices was never set
HID: Revert "Revert "HID: Fix logitech-dj: missing Unifying device issue""
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) goto out; } - mutex_unlock(&minors_lock); init_waitqueue_head(&dev->wait); INIT_LIST_HEAD(&dev->list); @@ -528,6 +527,7 @@ int hidraw_connect(struct hid_device *hid) dev->exist = 1; hid->hidraw = dev; + mutex_unlock(&minors_lock); out: return result; |