On Wed, 24 Aug 2011, Dan Carpenter wrote:
quoted hunk ↗ jump to hunk
We recently introduced locking into this function, but we missed an
error path which needs an unlock.
Signed-off-by: Dan Carpenter <redacted>
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 582be00..ed0cd09 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1643,8 +1643,10 @@ static int hid_device_probe(struct device *dev)
if (!hdev->driver) {
id = hid_match_device(hdev, hdrv);
- if (id == NULL)
- return -ENODEV;
+ if (id == NULL) {
+ ret = -ENODEV;
+ goto unlock;
+ }
hdev->driver = hdrv;
if (hdrv->probe) {@@ -1657,7 +1659,7 @@ static int hid_device_probe(struct device *dev)
if (ret)
hdev->driver = NULL;
}
-
+unlock:
up(&hdev->driver_lock);
return ret;
}
Good catch Dan, thanks. Applied.
--
Jiri Kosina
SUSE Labs