[PATCH] pcmcia/ds: handle any error code

register_chrdev() can return errors (negative) other then -EBUSY, so check
for any negative error code.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 66150d08b5c7c6d470c83a723559504b9b40dc70..c4ade288c5da6dcdcb497882f1dd1f8b659c29f4 100644 (file)
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -1592,9 +1592,9 @@ static int __init init_pcmcia_bus(void)
 
        /* Set up character device for user mode clients */
        i = register_chrdev(0, "pcmcia", &ds_fops);
 
        /* Set up character device for user mode clients */
        i = register_chrdev(0, "pcmcia", &ds_fops);

-       if (i == -EBUSY)
+       if (i < 0)

                printk(KERN_NOTICE "unable to find a free device # for "
                printk(KERN_NOTICE "unable to find a free device # for "

-                      "Driver Services\n");
+                      "Driver Services (error=%d)\n", i);

        else
                major_dev = i;
 
        else
                major_dev = i;