summaryrefslogtreecommitdiff
path: root/drivers/misc
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2013-05-21 18:52:09 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-21 09:57:55 -0700
commitbbedf2fc207bbd89c109123caee7cf0497030762 (patch)
tree0f344563c17bdb3796793314a9a019251ebbcfea /drivers/misc
parentd2242a384355773c711a936522bcfae0f35f8c2a (diff)
downloadlinux-3.10-bbedf2fc207bbd89c109123caee7cf0497030762.tar.gz
linux-3.10-bbedf2fc207bbd89c109123caee7cf0497030762.tar.bz2
linux-3.10-bbedf2fc207bbd89c109123caee7cf0497030762.zip
mei: bus: Reset event_cb when disabling a device
After cancelling all reads from the disable hook, we need to reset the event_cb pointer as well or else we won't be able to set a new one up when re-enabling the device. Acked-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/mei/bus.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c
index 1e935eacaa7..9ecd49a7be1 100644
--- a/drivers/misc/mei/bus.c
+++ b/drivers/misc/mei/bus.c
@@ -496,6 +496,8 @@ int mei_cl_disable_device(struct mei_cl_device *device)
}
}
+ device->event_cb = NULL;
+
mutex_unlock(&dev->device_lock);
if (!device->ops || !device->ops->disable)