mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 22:51:42 +00:00
Char/misc fix for 3.8-rc3
Here is a single fix for the mei driver that resolves a reported issue. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iEYEABECAAYFAlDzjO8ACgkQMUfUDdst+ymujgCfRtmhShKo0KJXYlIt13WrXKMg h48An0jvjvpwBs0rL97cUN05H9Qk0/Nr =8JYJ -----END PGP SIGNATURE----- Merge tag 'char-misc-3.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc Pull char/misc fix from Greg Kroah-Hartman: "Here is a single fix for the mei driver that resolves a reported issue. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" * tag 'char-misc-3.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: mei: fix mismatch in mutex unlock-lock in mei_amthif_read()
This commit is contained in:
commit
f6a0e2ca7b
@ -187,13 +187,13 @@ int mei_amthif_read(struct mei_device *dev, struct file *file,
|
||||
wait_ret = wait_event_interruptible(dev->iamthif_cl.wait,
|
||||
(cb = mei_amthif_find_read_list_entry(dev, file)));
|
||||
|
||||
/* Locking again the Mutex */
|
||||
mutex_lock(&dev->device_lock);
|
||||
|
||||
if (wait_ret)
|
||||
return -ERESTARTSYS;
|
||||
|
||||
dev_dbg(&dev->pdev->dev, "woke up from sleep\n");
|
||||
|
||||
/* Locking again the Mutex */
|
||||
mutex_lock(&dev->device_lock);
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user