diff options
| author | Tomas Winkler | 2015-03-26 23:27:59 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-04-03 16:18:56 +0200 |
| commit | 6a84d63d22a0ac79ab422b69ef2b4d75002c5641 (patch) | |
| tree | 0272d21b8d66df5759a2c8e0f0d0a18f90ec812a /drivers/misc | |
| parent | mei: use mei_cl_is_connected consistently (diff) | |
| download | kernel-qcow2-linux-6a84d63d22a0ac79ab422b69ef2b4d75002c5641.tar.gz kernel-qcow2-linux-6a84d63d22a0ac79ab422b69ef2b4d75002c5641.tar.xz kernel-qcow2-linux-6a84d63d22a0ac79ab422b69ef2b4d75002c5641.zip | |
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')
| -rw-r--r-- | drivers/misc/mei/bus.c | 4 | ||||
| -rw-r--r-- | drivers/misc/mei/client.h | 14 | ||||
| -rw-r--r-- | drivers/misc/mei/main.c | 4 |
3 files changed, 12 insertions, 10 deletions
diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c index b724a67696fc..4cf38c39878a 100644 --- a/drivers/misc/mei/bus.c +++ b/drivers/misc/mei/bus.c @@ -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, (!list_empty(&cl->rd_completed)) || - mei_cl_is_transitioning(cl))) { + (!mei_cl_is_connected(cl)))) { if (signal_pending(current)) return -EINTR; @@ -311,7 +311,7 @@ ssize_t __mei_cl_recv(struct mei_cl *cl, u8 *buf, size_t length) mutex_lock(&dev->device_lock); - if (mei_cl_is_transitioning(cl)) { + if (!mei_cl_is_connected(cl)) { rets = -EBUSY; goto out; } diff --git a/drivers/misc/mei/client.h b/drivers/misc/mei/client.h index 7800d1bd8ba1..0a39e5d45171 100644 --- a/drivers/misc/mei/client.h +++ b/drivers/misc/mei/client.h @@ -90,16 +90,18 @@ int mei_cl_flow_ctrl_reduce(struct mei_cl *cl); /* * 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) { 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); int mei_cl_disconnect(struct mei_cl *cl); 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, if (wait_event_interruptible(cl->rx_wait, (!list_empty(&cl->rd_completed)) || - mei_cl_is_transitioning(cl))) { + (!mei_cl_is_connected(cl)))) { if (signal_pending(current)) return -EINTR; @@ -211,7 +211,7 @@ static ssize_t mei_read(struct file *file, char __user *ubuf, } mutex_lock(&dev->device_lock); - if (mei_cl_is_transitioning(cl)) { + if (!mei_cl_is_connected(cl)) { rets = -EBUSY; goto out; } |