Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-29 15:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

HID: unlock on error path in hid_device_probe()

Browse Source 
We recently introduced locking into this function, but we missed an
error path which needs an unlock.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Dan Carpenter 2011-08-24 14:27:46 +03:00 committed by Jiri Kosina
parent 54d3339ac1
commit ba623a774f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/hid/hid-core.c
View File

@ -1642,8 +1642,10 @@ static int hid_device_probe(struct device *dev)
if (!hdev->driver) { if (!hdev->driver) {
id = hid_match_device(hdev, hdrv); id = hid_match_device(hdev, hdrv);
if (id == NULL) if (id == NULL) {
return -ENODEV; ret = -ENODEV;
goto unlock;
}
hdev->driver = hdrv; hdev->driver = hdrv;
if (hdrv->probe) { if (hdrv->probe) {
@ -1656,7 +1658,7 @@ static int hid_device_probe(struct device *dev)
if (ret) if (ret)
hdev->driver = NULL; hdev->driver = NULL;
} }
unlock:
up(&hdev->driver_lock); up(&hdev->driver_lock);
return ret; return ret;
} }