aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/pcmcia/cm4000_cs.c6
-rw-r--r--drivers/char/pcmcia/cm4040_cs.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index 50d20aafeb18..d9fdef227910 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -1973,14 +1973,14 @@ static int __init cmm_init(void)
1973 printk(KERN_INFO "%s\n", version); 1973 printk(KERN_INFO "%s\n", version);
1974 1974
1975 cmm_class = class_create(THIS_MODULE, "cardman_4000"); 1975 cmm_class = class_create(THIS_MODULE, "cardman_4000");
1976 if (!cmm_class) 1976 if (IS_ERR(cmm_class))
1977 return -1; 1977 return PTR_ERR(cmm_class);
1978 1978
1979 major = register_chrdev(0, DEVICE_NAME, &cm4000_fops); 1979 major = register_chrdev(0, DEVICE_NAME, &cm4000_fops);
1980 if (major < 0) { 1980 if (major < 0) {
1981 printk(KERN_WARNING MODULE_NAME 1981 printk(KERN_WARNING MODULE_NAME
1982 ": could not get major number\n"); 1982 ": could not get major number\n");
1983 return -1; 1983 return major;
1984 } 1984 }
1985 1985
1986 rc = pcmcia_register_driver(&cm4000_driver); 1986 rc = pcmcia_register_driver(&cm4000_driver);
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index 55cf4be42976..7368332c698c 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -721,14 +721,14 @@ static int __init cm4040_init(void)
721 721
722 printk(KERN_INFO "%s\n", version); 722 printk(KERN_INFO "%s\n", version);
723 cmx_class = class_create(THIS_MODULE, "cardman_4040"); 723 cmx_class = class_create(THIS_MODULE, "cardman_4040");
724 if (!cmx_class) 724 if (IS_ERR(cmx_class))
725 return -1; 725 return PTR_ERR(cmx_class);
726 726
727 major = register_chrdev(0, DEVICE_NAME, &reader_fops); 727 major = register_chrdev(0, DEVICE_NAME, &reader_fops);
728 if (major < 0) { 728 if (major < 0) {
729 printk(KERN_WARNING MODULE_NAME 729 printk(KERN_WARNING MODULE_NAME
730 ": could not get major number\n"); 730 ": could not get major number\n");
731 return -1; 731 return major;
732 } 732 }
733 733
734 rc = pcmcia_register_driver(&reader_driver); 734 rc = pcmcia_register_driver(&reader_driver);