diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-18 12:31:04 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-18 12:31:04 -0500 |
commit | 6596afe3f3b17b44c5fcc1a8c1102e0fe28a17eb (patch) | |
tree | ee42b5053ffd3df4f6d9c2fe461c2b3cc015df1c /drivers/misc/mei/amthif.c | |
parent | 78a61ab79ae6bd75593b63fbaf5299c96bac0ea4 (diff) | |
parent | 7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619 (diff) |
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, | |||
200 | wait_ret = wait_event_interruptible(dev->iamthif_cl.wait, | 200 | wait_ret = wait_event_interruptible(dev->iamthif_cl.wait, |
201 | (cb = mei_amthif_find_read_list_entry(dev, file))); | 201 | (cb = mei_amthif_find_read_list_entry(dev, file))); |
202 | 202 | ||
203 | /* Locking again the Mutex */ | ||
204 | mutex_lock(&dev->device_lock); | ||
205 | |||
203 | if (wait_ret) | 206 | if (wait_ret) |
204 | return -ERESTARTSYS; | 207 | return -ERESTARTSYS; |
205 | 208 | ||
206 | dev_dbg(&dev->pdev->dev, "woke up from sleep\n"); | 209 | dev_dbg(&dev->pdev->dev, "woke up from sleep\n"); |
207 | |||
208 | /* Locking again the Mutex */ | ||
209 | mutex_lock(&dev->device_lock); | ||
210 | } | 210 | } |
211 | 211 | ||
212 | 212 | ||