korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-18 01:34:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

mei: replace check for connection instead of transitioning

Browse Source 
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>
This commit is contained in:
Tomas Winkler 2015-03-27 00:27:59 +02:00 committed by Greg Kroah-Hartman
parent f3de9b635d
commit 6a84d63d22
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/misc/mei/bus.c
View File

@ -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;
}

14
drivers/misc/mei/client.h
View File

@ -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);

4
drivers/misc/mei/main.c
View File

@ -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;
}