---

yaml --- r: 311132 b: refs/heads/master c: a44cab4 h: refs/heads/master v: v3
git-mirror · Jun 13, 2012 · ec72a23 · ec72a23
1 parent 69cb56e
commit ec72a23
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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");