Commit 5adf0d58 authored by Krzysztof Rusocki's avatar Krzysztof Rusocki Committed by Linus Torvalds

[PATCH] cmpci oops on rmmod + fix

The cmpci driver included in Linux 2.6.7 causes an oops on rmmod, I believe
cm_remove should be marked __devexit rather than __devinit.
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 89076ea3
...@@ -3280,7 +3280,7 @@ MODULE_AUTHOR("ChenLi Tien, cltien@cmedia.com.tw"); ...@@ -3280,7 +3280,7 @@ MODULE_AUTHOR("ChenLi Tien, cltien@cmedia.com.tw");
MODULE_DESCRIPTION("CM8x38 Audio Driver"); MODULE_DESCRIPTION("CM8x38 Audio Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static void __devinit cm_remove(struct pci_dev *dev) static void __devexit cm_remove(struct pci_dev *dev)
{ {
struct cm_state *s = pci_get_drvdata(dev); struct cm_state *s = pci_get_drvdata(dev);
...@@ -3337,7 +3337,7 @@ static struct pci_driver cm_driver = { ...@@ -3337,7 +3337,7 @@ static struct pci_driver cm_driver = {
.name = "cmpci", .name = "cmpci",
.id_table = id_table, .id_table = id_table,
.probe = cm_probe, .probe = cm_probe,
.remove = cm_remove .remove = __devexit_p(cm_remove)
}; };
static int __init init_cmpci(void) static int __init init_cmpci(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment