diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-14 18:06:24 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-14 18:06:24 +0100 |
| commit | f6a0e2ca7b1fe89da4e4b0afa6ba08dc34f1a0f7 (patch) | |
| tree | 3c5db310977d5dd59858da621bcbddd3583186ec | |
| parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
| parent | mei: fix mismatch in mutex unlock-lock in mei_amthif_read() (diff) | |
| download | linux-f6a0e2ca7b1fe89da4e4b0afa6ba08dc34f1a0f7.tar.xz linux-f6a0e2ca7b1fe89da4e4b0afa6ba08dc34f1a0f7.zip | |
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()
| -rw-r--r-- | drivers/misc/mei/amthif.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c index 18794aea6062..e40ffd9502d1 100644 --- a/drivers/misc/mei/amthif.c +++ b/drivers/misc/mei/amthif.c @@ -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); } |