summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThayumanavar Sachithanantham <thayumk@gmail.com>2006-04-20 09:43:15 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-20 14:54:03 (GMT)
commit0324680064fd89d6ad52e89a4ccf16dec3ea3caa (patch)
tree7e487031a015ed54e3c422901b17bab671935f68
parentc16c556e0e460a4e8c3f97ea0d50a1217f7fa449 (diff)
downloadlinux-0324680064fd89d6ad52e89a4ccf16dec3ea3caa.tar.xz
[PATCH] cs5535_gpio.c: call cdev_del() during module_exit to unmap kobject references and other cleanups
During module unloading, cdev_del() must be called to unmap cdev related kobject references and other cleanups(such as inode->i_cdev being set to NULL) which prevents the OOPS upon subsequent loading, usage and unloading of modules(as seen in the mail thread http://marc.theaimsgroup.com/?l=linux-kernel&m=114533640609018&w=2). Also, remove unneeded test of gpio_base. Signed-off-by: Thayumanavar Sachithanantham <thayumk@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/char/cs5535_gpio.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/cs5535_gpio.c b/drivers/char/cs5535_gpio.c
index 5d72f50..46d6603 100644
--- a/drivers/char/cs5535_gpio.c
+++ b/drivers/char/cs5535_gpio.c
@@ -241,9 +241,10 @@ static int __init cs5535_gpio_init(void)
static void __exit cs5535_gpio_cleanup(void)
{
dev_t dev_id = MKDEV(major, 0);
+
+ cdev_del(&cs5535_gpio_cdev);
unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT);
- if (gpio_base != 0)
- release_region(gpio_base, CS5535_GPIO_SIZE);
+ release_region(gpio_base, CS5535_GPIO_SIZE);
}
module_init(cs5535_gpio_init);