summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2015-03-19 12:10:09 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-25 11:36:37 +0100
commitab3ae0096a6d31e1b244c5c5155f48ef3700329e (patch)
tree742d1e4ebd8b82c9e881fc7634fa036347e27792 /drivers/misc
parentaa6467f190d32b263f7144239c89c63c922d9ff8 (diff)
downloadop-kernel-dev-ab3ae0096a6d31e1b244c5c5155f48ef3700329e.zip
op-kernel-dev-ab3ae0096a6d31e1b244c5c5155f48ef3700329e.tar.gz
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>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/mei/client.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/misc/mei/client.h b/drivers/misc/mei/client.h
index eb02f34..7800d1b 100644
--- a/drivers/misc/mei/client.h
+++ b/drivers/misc/mei/client.h
@@ -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)
{
- return cl->dev &&
- cl->dev->dev_state == MEI_DEV_ENABLED &&
- cl->state == MEI_FILE_CONNECTED;
+ return cl->state == MEI_FILE_CONNECTED;
}
static inline bool mei_cl_is_transitioning(struct mei_cl *cl)
{
OpenPOWER on IntegriCloud