Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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()

+3 -3
+3 -3
drivers/misc/mei/amthif.c
··· 187 187 wait_ret = wait_event_interruptible(dev->iamthif_cl.wait, 188 188 (cb = mei_amthif_find_read_list_entry(dev, file))); 189 189 190 + /* Locking again the Mutex */ 191 + mutex_lock(&dev->device_lock); 192 + 190 193 if (wait_ret) 191 194 return -ERESTARTSYS; 192 195 193 196 dev_dbg(&dev->pdev->dev, "woke up from sleep\n"); 194 - 195 - /* Locking again the Mutex */ 196 - mutex_lock(&dev->device_lock); 197 197 } 198 198 199 199