Commit a44cab4a authored May 29, 2012 by Tomas Winkler Committed by Greg Kroah-Hartman Jun 13, 2012

misc: mei: unregister misc device in pci_remove function



Since the misc device is registered only in the pci probe function
it has to be also unregistered in the counterpart pci remove function
and not in the module exit function.
In case of probe failure the driver was oopsing in module exit function.

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent aa189ecd

drivers/misc/mei/main.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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");

Admin message