summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2015-07-23 14:08:37 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-08-04 02:20:26 +0200
commit7e280ab694e2885ee300de9cf5e7047c68230148 (patch)
treecfbbd3b0ddb5a01035e53766578feacd45bdd7b6
parentmei: bus: rename uevent handler to mei_cl_device_uevent (diff)
downloadlinux-7e280ab694e2885ee300de9cf5e7047c68230148.tar.xz
linux-7e280ab694e2885ee300de9cf5e7047c68230148.zip
mei: bus: don't enable events implicitly in device enable
Do not enable events implicitly in mei_cl_enable_device, it should be done explicitly using mei_cl_register_event_cb so the events are enabled only when needed. The NFC drivers has been already using it that way so no need for further changes just remove the code from mei_cl_enable_device. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/misc/mei/bus.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c
index bec213b92550..257e200b5343 100644
--- a/drivers/misc/mei/bus.c
+++ b/drivers/misc/mei/bus.c
@@ -332,9 +332,6 @@ int mei_cl_enable_device(struct mei_cl_device *cldev)
mutex_unlock(&bus->device_lock);
- if (cldev->event_cb)
- mei_cl_read_start(cldev->cl, 0, NULL);
-
return 0;
}
EXPORT_SYMBOL_GPL(mei_cl_enable_device);