projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7d1311b
)
mei: reset client state on queued connect request
author
Alexander Usyskin
<
[email protected]
>
Tue, 12 Aug 2014 15:07:56 +0000
(18:07 +0300)
committer
Greg Kroah-Hartman
<
[email protected]
>
Mon, 25 Aug 2014 20:16:23 +0000
(13:16 -0700)
If connect request is queued (e.g. device in pg) set client state
to initializing, thus avoid preliminary exit in wait if current
state is disconnected.
This is regression from:
commit
e4d8270e604c3202131bac607969605ac397b893
Author: Alexander Usyskin <
[email protected]
>
mei: set connecting state just upon connection request is sent to the fw
CC:
[email protected]
# 3.15+
Signed-off-by: Alexander Usyskin <
[email protected]
>
Signed-off-by: Tomas Winkler <
[email protected]
>
Signed-off-by: Greg Kroah-Hartman <
[email protected]
>
drivers/misc/mei/client.c
patch
|
blob
|
history
diff --git
a/drivers/misc/mei/client.c
b/drivers/misc/mei/client.c
index 324e1de936871952c726d42a33826c19a827cdb8..2da05c0e113d0b62d917e4de4b12e15b46defac8 100644
(file)
--- a/
drivers/misc/mei/client.c
+++ b/
drivers/misc/mei/client.c
@@
-601,6
+601,7
@@
int mei_cl_connect(struct mei_cl *cl, struct file *file)
cl->timer_count = MEI_CONNECT_TIMEOUT;
list_add_tail(&cb->list, &dev->ctrl_rd_list.list);
} else {
+ cl->state = MEI_FILE_INITIALIZING;
list_add_tail(&cb->list, &dev->ctrl_wr_list.list);
}