diff options
| author | Greg Kroah-Hartman | 2013-01-18 18:31:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-01-18 18:31:04 +0100 |
| commit | 6596afe3f3b17b44c5fcc1a8c1102e0fe28a17eb (patch) | |
| tree | ee42b5053ffd3df4f6d9c2fe461c2b3cc015df1c /drivers/misc/mei/amthif.c | |
| parent | ntb: remove __dev* markings (diff) | |
| parent | Linux 3.8-rc4 (diff) | |
| download | kernel-qcow2-linux-6596afe3f3b17b44c5fcc1a8c1102e0fe28a17eb.tar.gz kernel-qcow2-linux-6596afe3f3b17b44c5fcc1a8c1102e0fe28a17eb.tar.xz kernel-qcow2-linux-6596afe3f3b17b44c5fcc1a8c1102e0fe28a17eb.zip | |
Merge 3.8-rc4 into char-misc-next
This brings in all of the mei and other fixes that are needed to continue
development in this branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/amthif.c')
| -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 7199e8369f1e..263ed4ccd6f2 100644 --- a/drivers/misc/mei/amthif.c +++ b/drivers/misc/mei/amthif.c @@ -200,13 +200,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); } |