X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=drivers%2Fmisc%2Fmei%2Finit.c;h=3edafc8d3ad49aac9aac9ae884c2a20856ff691f;hb=97ccf63f42721e758bb3cd1aa8967a89d26ed0bb;hp=e374661652cd6a5460556ba8b8661c1e5247a46c;hpb=4bbc2bc1a4e81c1a3522b3bd9d43fffd2eca8c9e;p=deliverable%2Flinux.git

diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index e374661652cd..3edafc8d3ad4 100644
--- 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);