Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6a0e2ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">

* 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()
parents 7f1825da e6028db0

drivers/misc/mei/amthif.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

	}