[patch] 2.4.21-rc2: fix sound/kahlua.c .text.exit error

Adrian Bunk (bunk@fs.tum.de)
Sun, 11 May 2003 00:21:38 +0200


drivers/sound/kahlua.c in 2.4.21-rc2 causes a .text.exit error at the
final linking when compiled statically into a kernel with CONFIG_HOTPLUG
enabled. The pointer to remove_one is __devexit_p and not discarded but
the __exit remove_one is discarded.

The following patch is needed:

--- linux-2.4.21-rc2-full/drivers/sound/kahlua.c.old 2003-05-10 19:03:12.000000000 +0200
+++ linux-2.4.21-rc2-full/drivers/sound/kahlua.c 2003-05-10 19:03:41.000000000 +0200
@@ -182,7 +182,7 @@
return 0;
}

-static void __exit remove_one(struct pci_dev *pdev)
+static void __devexit remove_one(struct pci_dev *pdev)
{
struct address_info *hw_config = pci_get_drvdata(pdev);
sb_dsp_unload(hw_config, 0);
@@ -219,7 +219,7 @@
return pci_module_init(&kahlua_driver);
}

-static void __exit kahlua_cleanup_module(void)
+static void __devexit kahlua_cleanup_module(void)
{
return pci_unregister_driver(&kahlua_driver);
}

Please apply for -rc3
Adrian

-- 

"Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed

- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/