[PATCH] paride: register_chrdev fix

If the user specified `major=0' (odd thing to do), pg.c will use dynamic
allocation.  We need to pick up that major for subsequent unregister_chrdev().

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index 6f5df0fad703..79b868254032 100644
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -643,7 +643,8 @@ static ssize_t pg_read(struct file *filp, char __user *buf, size_t count, loff_t
 
 static int __init pg_init(void)
 {
-        int unit, err = 0;
+        int unit;
+        int err;
 
         if (disable){
                 err = -1;
@@ -657,16 +658,17 @@ static int __init pg_init(void)
                 goto out;
         }
 
-        if (register_chrdev(major, name, &pg_fops)) {
+        err = register_chrdev(major, name, &pg_fops);
+        if (err < 0) {
                 printk("pg_init: unable to get major number %d\n", major);
                 for (unit = 0; unit < PG_UNITS; unit++) {
                         struct pg *dev = &devices[unit];
                         if (dev->present)
                                 pi_release(dev->pi);
                 }
-                err = -1;
                 goto out;
         }
+        major = err;    /* In case the user specified `major=0' (dynamic) */
         pg_class = class_create(THIS_MODULE, "pg");
         if (IS_ERR(pg_class)) {
                 err = PTR_ERR(pg_class);