From ec72a235fe1f68334dd5d690586d2a48577eb1b8 Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Tue, 29 May 2012 16:39:11 +0300
Subject: [PATCH] --- yaml --- r: 311132 b: refs/heads/master c:
 a44cab4aff7e72e7052521121fd8ceca51351534 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/misc/mei/main.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b4e8f4d11f60..d1af66ef1b63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa189ecdc0c7fad2166ba6d133df8bd214550f68
+refs/heads/master: a44cab4aff7e72e7052521121fd8ceca51351534
diff --git a/trunk/drivers/misc/mei/main.c b/trunk/drivers/misc/mei/main.c
index 88e5953eb5be..a5a17e78a96c 100644
--- a/trunk/drivers/misc/mei/main.c
+++ b/trunk/drivers/misc/mei/main.c
@@ -1101,6 +1101,8 @@ static void __devexit mei_remove(struct pci_dev *pdev)
 
 	pci_release_regions(pdev);
 	pci_disable_device(pdev);
+
+	misc_deregister(&mei_misc_device);
 }
 #ifdef CONFIG_PM
 static int mei_pci_suspend(struct device *device)
@@ -1216,7 +1218,6 @@ module_init(mei_init_module);
  */
 static void __exit mei_exit_module(void)
 {
-	misc_deregister(&mei_misc_device);
 	pci_unregister_driver(&mei_driver);
 
 	pr_debug("unloaded successfully.\n");