mei: fix regression on NFC connection

In mei_host_client_init function we enable the all internal
connected clients including NFC. This is done before we set the device
to enabled state and let userspace call open.
We need to check only for MEI_FILE_CONNECTED in mei_cl_is_connected
in order to enable the communication with the clients before
MEI_DEV_ENABLED is set.

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-19 12:10:09 +02:00 коммит произвёл Greg Kroah-Hartman
Родитель aa6467f190
Коммит ab3ae0096a
1 изменённых файлов: 1 добавлений и 3 удалений

Просмотреть файл

@ -92,9 +92,7 @@ int mei_cl_flow_ctrl_reduce(struct mei_cl *cl);
*/ */
static inline bool mei_cl_is_connected(struct mei_cl *cl) static inline bool mei_cl_is_connected(struct mei_cl *cl)
{ {
return cl->dev && return cl->state == MEI_FILE_CONNECTED;
cl->dev->dev_state == MEI_DEV_ENABLED &&
cl->state == MEI_FILE_CONNECTED;
} }
static inline bool mei_cl_is_transitioning(struct mei_cl *cl) static inline bool mei_cl_is_transitioning(struct mei_cl *cl)
{ {