From 67e6b17162fbff8b8c7953dea6ea03ed0988ac6b Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Tue, 28 Mar 2006 01:56:18 -0800
Subject: [PATCH] --- yaml --- r: 24459 b: refs/heads/master c:
 8637980bab3f09157eef20cc65d2eb7393c770fd h: refs/heads/master i:   24457:
 313a977916196f018bcb5c080a97e9b7337785d6   24455:
 d003708126a3fefcf0ea071cfa9726e30a7b5148 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/block/paride/pg.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6b403b03e6b9..52f9d2870d4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a687fb18cbd061de2092632cf77e6b9dc93cf7cd
+refs/heads/master: 8637980bab3f09157eef20cc65d2eb7393c770fd
diff --git a/trunk/drivers/block/paride/pg.c b/trunk/drivers/block/paride/pg.c
index 6f5df0fad703..79b868254032 100644
--- a/trunk/drivers/block/paride/pg.c
+++ b/trunk/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);