[PATCH] paride: return proper error code

This patch makes module init return proper value instead of -1 (-EPERM).

Cc: Tim Waugh <tim@cyberelk.net>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

4 files changed, 12 insertions, 12 deletions

diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c
index ac5ba462710..c852eed91e4 100644
--- a/drivers/block/paride/pcd.c
+++ b/drivers/block/paride/pcd.c
@@ -912,12 +912,12 @@ static int __init pcd_init(void)
         int unit;
 
         if (disable)
-                return -1;
+                return -EINVAL;
 
         pcd_init_units();
 
         if (pcd_detect())
-                return -1;
+                return -ENODEV;
 
         /* get the atapi capabilities page */
         pcd_probe_capabilities();
@@ -925,7 +925,7 @@ static int __init pcd_init(void)
         if (register_blkdev(major, name)) {
                 for (unit = 0, cd = pcd; unit < PCD_UNITS; unit++, cd++)
                         put_disk(cd->disk);
-                return -1;
+                return -EBUSY;
         }
 
         pcd_queue = blk_init_queue(do_pcd_request, &pcd_lock);
@@ -933,7 +933,7 @@ static int __init pcd_init(void)
                 unregister_blkdev(major, name);
                 for (unit = 0, cd = pcd; unit < PCD_UNITS; unit++, cd++)
                         put_disk(cd->disk);
-                return -1;
+                return -ENOMEM;
         }
 
         for (unit = 0, cd = pcd; unit < PCD_UNITS; unit++, cd++) {
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index 1a9dee19efc..7cdaa195126 100644
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -933,25 +933,25 @@ static int __init pf_init(void)
         int unit;
 
         if (disable)
-                return -1;
+                return -EINVAL;
 
         pf_init_units();
 
         if (pf_detect())
-                return -1;
+                return -ENODEV;
         pf_busy = 0;
 
         if (register_blkdev(major, name)) {
                 for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++)
                         put_disk(pf->disk);
-                return -1;
+                return -EBUSY;
         }
         pf_queue = blk_init_queue(do_pf_request, &pf_spin_lock);
         if (!pf_queue) {
                 unregister_blkdev(major, name);
                 for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++)
                         put_disk(pf->disk);
-                return -1;
+                return -ENOMEM;
         }
 
         blk_queue_max_phys_segments(pf_queue, cluster);
diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index 13f998aa1cd..9970aedbb5d 100644
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -646,14 +646,14 @@ static int __init pg_init(void)
         int err;
 
         if (disable){
-                err = -1;
+                err = -EINVAL;
                 goto out;
         }
 
         pg_init_units();
 
         if (pg_detect()) {
-                err = -1;
+                err = -ENODEV;
                 goto out;
         }
 
diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index 35fb2663672..c902b25e486 100644
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -946,12 +946,12 @@ static int __init pt_init(void)
         int err;
 
         if (disable) {
-                err = -1;
+                err = -EINVAL;
                 goto out;
         }
 
         if (pt_detect()) {
-                err = -1;
+                err = -ENODEV;
                 goto out;
         }