Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[powerpc.git] / drivers / block / paride / pt.c

diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index 686c955..d2013d3 100644 (file)
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -146,6 +146,7 @@ static int (*drives[4])[6] = {&drive0, &drive1, &drive2, &drive3};
 #include <linux/slab.h>
 #include <linux/mtio.h>
 #include <linux/device.h>
+#include <linux/sched.h>       /* current, TASK_*, schedule_timeout() */
 
 #include <asm/uaccess.h>
 
@@ -942,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;
@@ -954,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);