diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2015-03-26 18:27:59 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-03 10:18:56 -0400 |
commit | 6a84d63d22a0ac79ab422b69ef2b4d75002c5641 (patch) | |
tree | 0272d21b8d66df5759a2c8e0f0d0a18f90ec812a /drivers/misc/mei/main.c | |
parent | f3de9b635d93a3d268adda428e1df94091506a42 (diff) |
mei: replace check for connection instead of transitioning
The function mei_cl_is_transitioning is just opposite
of mei_cl_is_connected. What we actually wanted to
check is if we lost connection so we can discard
the check for transition and check for 'not connected'
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/main.c')
-rw-r--r-- | drivers/misc/mei/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c index 29fa88b6fa17..7f77f39c24a7 100644 --- a/drivers/misc/mei/main.c +++ b/drivers/misc/mei/main.c | |||
@@ -203,7 +203,7 @@ static ssize_t mei_read(struct file *file, char __user *ubuf, | |||
203 | 203 | ||
204 | if (wait_event_interruptible(cl->rx_wait, | 204 | if (wait_event_interruptible(cl->rx_wait, |
205 | (!list_empty(&cl->rd_completed)) || | 205 | (!list_empty(&cl->rd_completed)) || |
206 | mei_cl_is_transitioning(cl))) { | 206 | (!mei_cl_is_connected(cl)))) { |
207 | 207 | ||
208 | if (signal_pending(current)) | 208 | if (signal_pending(current)) |
209 | return -EINTR; | 209 | return -EINTR; |
@@ -211,7 +211,7 @@ static ssize_t mei_read(struct file *file, char __user *ubuf, | |||
211 | } | 211 | } |
212 | 212 | ||
213 | mutex_lock(&dev->device_lock); | 213 | mutex_lock(&dev->device_lock); |
214 | if (mei_cl_is_transitioning(cl)) { | 214 | if (!mei_cl_is_connected(cl)) { |
215 | rets = -EBUSY; | 215 | rets = -EBUSY; |
216 | goto out; | 216 | goto out; |
217 | } | 217 | } |