Skip to contentSkip to conversation

dtlk: fix error checks in module_init()

PATCH New Akinobu Mita 1 participant 1 message Apr 7, 2007 Char and misc drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dtlk: fix error checks in module_init()

This patch fixes two things in module_init.

- fix register_chrdev() error check

Currently dtlk doesn't check register_chrdev() failure correctly. register_chrdev() returns a errno on failure.

- check probe failure

dtlk ignores probe failure and allows the module loading without such device. I got "Trying to free nonexistent resource" message by release_region() when unloading module without device.

Cc Chris Pallotta <[email protected]>
Cc Jim Van Zandt <[email protected]>
---
 drivers/char/dtlk.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/char/dtlk.c +10 -4
Index: 2.6-mm/drivers/char/dtlk.c
===================================================================
@@ -324,16 +324,22 @@ static int dtlk_release(struct inode *in
 
 static int __init dtlk_init(void)
 {
+	int err;
+
 	dtlk_port_lpc = 0;
 	dtlk_port_tts = 0;
 	dtlk_busy = 0;
 	dtlk_major = register_chrdev(0, "dtlk", &dtlk_fops);
-	if (dtlk_major == 0) {
+	if (dtlk_major < 0) {
 		printk(KERN_ERR "DoubleTalk PC - cannot register device\n");
-		return 0;
+		return -EBUSY;
+	}
+	err = dtlk_dev_probe();
+	if (err) {
+		unregister_chrdev(dtlk_major, "dtlk");
+		return err;
 	}
-	if (dtlk_dev_probe() == 0)
-		printk(", MAJOR %d\n", dtlk_major);
+	printk(", MAJOR %d\n", dtlk_major);
 
 	init_waitqueue_head(&dtlk_process_list);