From 21d002a56861fb40d2d805663b679c890b2069ab Mon Sep 17 00:00:00 2001 From: Akinobu Mita Date: Tue, 17 Oct 2006 15:25:59 +0900 Subject: [PATCH] --- yaml --- r: 42402 b: refs/heads/master c: 5eb5fc97d83ee1f8fcf3490bb81ad14a99fc544c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/pcmcia/cm4000_cs.c | 6 +++--- trunk/drivers/char/pcmcia/cm4040_cs.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 819dc236bb2e..1047825ada4e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0517793fa8f98e6f30406b1811ea0312bca3a414 +refs/heads/master: 5eb5fc97d83ee1f8fcf3490bb81ad14a99fc544c diff --git a/trunk/drivers/char/pcmcia/cm4000_cs.c b/trunk/drivers/char/pcmcia/cm4000_cs.c index 50d20aafeb18..d9fdef227910 100644 --- a/trunk/drivers/char/pcmcia/cm4000_cs.c +++ b/trunk/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); diff --git a/trunk/drivers/char/pcmcia/cm4040_cs.c b/trunk/drivers/char/pcmcia/cm4040_cs.c index 55cf4be42976..7368332c698c 100644 --- a/trunk/drivers/char/pcmcia/cm4040_cs.c +++ b/trunk/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);