X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fblock%2Fparide%2Fpt.c;h=715ae5dc88fba4f8a2e1dd191d2bd8d591997d4c;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=d2013d362403819c49c2e21ffe54f64f311796cd;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index d2013d362..715ae5dc8 100644
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -943,8 +943,7 @@ static ssize_t pt_write(struct file *filp, const char __user *buf, size_t count,
 
 static int __init pt_init(void)
 {
-	int unit;
-	int err;
+	int unit, err = 0;
 
 	if (disable) {
 		err = -1;
@@ -956,15 +955,14 @@ static int __init pt_init(void)
 		goto out;
 	}
 
-	err = register_chrdev(major, name, &pt_fops);
-	if (err < 0) {
+	if (register_chrdev(major, name, &pt_fops)) {
 		printk("pt_init: unable to get major number %d\n", major);
 		for (unit = 0; unit < PT_UNITS; unit++)
 			if (pt[unit].present)
 				pi_release(pt[unit].pi);
+		err = -1;
 		goto out;
 	}
-	major = err;
 	pt_class = class_create(THIS_MODULE, "pt");
 	if (IS_ERR(pt_class)) {
 		err = PTR_ERR(pt_class);