Commit 6a84d63d authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman

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: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f3de9b63
...@@ -302,7 +302,7 @@ ssize_t __mei_cl_recv(struct mei_cl *cl, u8 *buf, size_t length) ...@@ -302,7 +302,7 @@ ssize_t __mei_cl_recv(struct mei_cl *cl, u8 *buf, size_t length)
if (wait_event_interruptible(cl->rx_wait, if (wait_event_interruptible(cl->rx_wait,
(!list_empty(&cl->rd_completed)) || (!list_empty(&cl->rd_completed)) ||
mei_cl_is_transitioning(cl))) { (!mei_cl_is_connected(cl)))) {
if (signal_pending(current)) if (signal_pending(current))
return -EINTR; return -EINTR;
...@@ -311,7 +311,7 @@ ssize_t __mei_cl_recv(struct mei_cl *cl, u8 *buf, size_t length) ...@@ -311,7 +311,7 @@ ssize_t __mei_cl_recv(struct mei_cl *cl, u8 *buf, size_t length)
mutex_lock(&dev->device_lock); mutex_lock(&dev->device_lock);
if (mei_cl_is_transitioning(cl)) { if (!mei_cl_is_connected(cl)) {
rets = -EBUSY; rets = -EBUSY;
goto out; goto out;
} }
......
...@@ -90,16 +90,18 @@ int mei_cl_flow_ctrl_reduce(struct mei_cl *cl); ...@@ -90,16 +90,18 @@ int mei_cl_flow_ctrl_reduce(struct mei_cl *cl);
/* /*
* MEI input output function prototype * MEI input output function prototype
*/ */
/**
* mei_cl_is_connected - host client is connected
*
* @cl: host clinet
*
* Return: true if the host clinet is connected
*/
static inline bool mei_cl_is_connected(struct mei_cl *cl) static inline bool mei_cl_is_connected(struct mei_cl *cl)
{ {
return cl->state == MEI_FILE_CONNECTED; return cl->state == MEI_FILE_CONNECTED;
} }
static inline bool mei_cl_is_transitioning(struct mei_cl *cl)
{
return MEI_FILE_INITIALIZING == cl->state ||
MEI_FILE_DISCONNECTED == cl->state ||
MEI_FILE_DISCONNECTING == cl->state;
}
bool mei_cl_is_other_connecting(struct mei_cl *cl); bool mei_cl_is_other_connecting(struct mei_cl *cl);
int mei_cl_disconnect(struct mei_cl *cl); int mei_cl_disconnect(struct mei_cl *cl);
......
...@@ -203,7 +203,7 @@ static ssize_t mei_read(struct file *file, char __user *ubuf, ...@@ -203,7 +203,7 @@ static ssize_t mei_read(struct file *file, char __user *ubuf,
if (wait_event_interruptible(cl->rx_wait, if (wait_event_interruptible(cl->rx_wait,
(!list_empty(&cl->rd_completed)) || (!list_empty(&cl->rd_completed)) ||
mei_cl_is_transitioning(cl))) { (!mei_cl_is_connected(cl)))) {
if (signal_pending(current)) if (signal_pending(current))
return -EINTR; return -EINTR;
...@@ -211,7 +211,7 @@ static ssize_t mei_read(struct file *file, char __user *ubuf, ...@@ -211,7 +211,7 @@ static ssize_t mei_read(struct file *file, char __user *ubuf,
} }
mutex_lock(&dev->device_lock); mutex_lock(&dev->device_lock);
if (mei_cl_is_transitioning(cl)) { if (!mei_cl_is_connected(cl)) {
rets = -EBUSY; rets = -EBUSY;
goto out; goto out;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment