diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2015-03-19 11:10:09 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-25 11:36:37 +0100 |
| commit | ab3ae0096a6d31e1b244c5c5155f48ef3700329e (patch) | |
| tree | 742d1e4ebd8b82c9e881fc7634fa036347e27792 /drivers/misc | |
| parent | VMCI: Guard against overflow in queue pair allocation (diff) | |
| download | linux-ab3ae0096a6d31e1b244c5c5155f48ef3700329e.tar.xz linux-ab3ae0096a6d31e1b244c5c5155f48ef3700329e.zip | |
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.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/misc/mei/client.h b/drivers/misc/mei/client.h index eb02f34b2fe0..7800d1bd8ba1 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) { |