Skip to contentSkip to conversation

cm4000_cs: fix return value check

PATCH In review Akinobu Mita 3 participants 3 messages Oct 17, 2006 – Oct 26, 2006 Char and misc drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cm4000_cs: fix return value check

The return value of class_create() need to be checked with IS_ERR(). And register_chrdev() returns errno on failure.
This patch includes these fixes for cm4000_cs and cm4040_cs.

 drivers/char/pcmcia/cm4000_cs.c |    6 +++---
 drivers/char/pcmcia/cm4040_cs.c |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/char/pcmcia/cm4000_cs.c +3 -3
Index: 2.6-rc/drivers/char/pcmcia/cm4000_cs.c
===================================================================
@@ -1973,14 +1973,14 @@ static int __init cmm_init(void)
 	printk(KERN_INFO "%s\n", version);
 
 	cmm_class = class_create(THIS_MODULE, "cardman_4000");
-	if (!cmm_class)
-		return -1;
+	if (IS_ERR(cmm_class))
+		return PTR_ERR(cmm_class);
 
 	major = register_chrdev(0, DEVICE_NAME, &cm4000_fops);
 	if (major < 0) {
 		printk(KERN_WARNING MODULE_NAME
 			": could not get major number\n");
-		return -1;
+		return major;
 	}
 
 	rc = pcmcia_register_driver(&cm4000_driver);
drivers/char/pcmcia/cm4040_cs.c +3 -3
Index: 2.6-rc/drivers/char/pcmcia/cm4040_cs.c
===================================================================
@@ -721,14 +721,14 @@ static int __init cm4040_init(void)
 
 	printk(KERN_INFO "%s\n", version);
 	cmx_class = class_create(THIS_MODULE, "cardman_4040");
-	if (!cmx_class)
-		return -1;
+	if (IS_ERR(cmx_class))
+		return PTR_ERR(cmx_class);
 
 	major = register_chrdev(0, DEVICE_NAME, &reader_fops);
 	if (major < 0) {
 		printk(KERN_WARNING MODULE_NAME
 			": could not get major number\n");
-		return -1;
+		return major;
 	}
 
 	rc = pcmcia_register_driver(&reader_driver);
#1 lore raw

Hi,

Quoted 6 lines · Akinobu Mita

The return value of class_create() need to be checked with IS_ERR(). And register_chrdev() returns errno on failure.
This patch includes these fixes for cm4000_cs and cm4040_cs.

Temporarily applied to pcmica-2.6.git, thanks. Harald, do you ACK?

Thanks,
Dominik

#2 lore raw
Quoted 9 lines · Dominik Brodowski
Quoted 6 lines · Akinobu Mita

The return value of class_create() need to be checked with IS_ERR(). And register_chrdev() returns errno on failure.
This patch includes these fixes for cm4000_cs and cm4040_cs.

Temporarily applied to pcmica-2.6.git, thanks. Harald, do you ACK?

yes, sorry. I've been too busy and the mail slipped through...

The patch is obviously fine. Thanks!

Signature · 3 lines
- Harald Welte <[email protected]>          	        http://gnumonks.org/
============================================================================
We all know Linux is great...it does infinite loops in 5 seconds. -- Linus