Merge remote-tracking branch 'char-misc/char-misc-next'

[karo-tx-linux.git] / drivers / misc / mei / init.c

diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index e374661652cd6a5460556ba8b8661c1e5247a46c..3edafc8d3ad49aac9aac9ae884c2a20856ff691f 100644 (file)
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -329,10 +329,10 @@ void mei_stop(struct mei_device *dev)
 {
        dev_dbg(dev->dev, "stopping the device.\n");
 
-       mei_cancel_work(dev);
-
        mei_cl_bus_remove_devices(dev);
 
+       mei_cancel_work(dev);
+
        mutex_lock(&dev->device_lock);
 
        mei_wd_stop(dev);