From 14d0ae8265d68a1fdb19451271e9c2c68cd0ec8a 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: 24460 b: refs/heads/master c:
 829d5f68ec59ff7c0fdd472132680df8e4b64f3e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 52f9d2870d4b..47d48e56db5a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8637980bab3f09157eef20cc65d2eb7393c770fd
+refs/heads/master: 829d5f68ec59ff7c0fdd472132680df8e4b64f3e
diff --git a/trunk/drivers/block/paride/pt.c b/trunk/drivers/block/paride/pt.c
index 715ae5dc88fb..d2013d362403 100644
--- a/trunk/drivers/block/paride/pt.c
+++ b/trunk/drivers/block/paride/pt.c
@@ -943,7 +943,8 @@ static ssize_t pt_write(struct file *filp, const char __user *buf, size_t count,
 
 static int __init pt_init(void)
 {
-	int unit, err = 0;
+	int unit;
+	int err;
 
 	if (disable) {
 		err = -1;
@@ -955,14 +956,15 @@ static int __init pt_init(void)
 		goto out;
 	}
 
-	if (register_chrdev(major, name, &pt_fops)) {
+	err = register_chrdev(major, name, &pt_fops);
+	if (err < 0) {
 		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);