summaryrefslogtreecommitdiff
path: root/drivers/misc
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-09 10:44:23 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-09 10:44:23 +0300
commite94f16a4fde646b3f155788fe37339b61264b0a9 (patch)
tree28f1cf8b1980b6b25c1c58e3e157610a1b851996 /drivers/misc
parentd2b5851d8583e690eeb5ac8dfff5da92e1f1468f (diff)
parent9eccca0843205f87c00404b663188b88eb248051 (diff)
downloadlinux-e94f16a4fde646b3f155788fe37339b61264b0a9.tar.xz
Merge 4.0-rc3 into char-misc-next
We want the mei fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/mei/init.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index 4596401888e5..97353cf8d9b6 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -341,6 +341,8 @@ void mei_stop(struct mei_device *dev)
dev->dev_state = MEI_DEV_POWER_DOWN;
mei_reset(dev);
+ /* move device to disabled state unconditionally */
+ dev->dev_state = MEI_DEV_DISABLED;
mutex_unlock(&dev->device_lock);