These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / block / paride / pg.c

diff --git a/kernel/drivers/block/paride/pg.c b/kernel/drivers/block/paride/pg.c
index 876d0c3..bfbd4c8 100644 (file)
--- a/kernel/drivers/block/paride/pg.c
+++ b/kernel/drivers/block/paride/pg.c
@@ -227,6 +227,7 @@ static int pg_identify(struct pg *dev, int log);
 static char pg_scratch[512];   /* scratch block buffer */
 
 static struct class *pg_class;
+static void *par_drv;          /* reference of parport driver */
 
 /* kernel glue structures */
 
@@ -481,6 +482,12 @@ static int pg_detect(void)
 
        printk("%s: %s version %s, major %d\n", name, name, PG_VERSION, major);
 
+       par_drv = pi_register_driver(name);
+       if (!par_drv) {
+               pr_err("failed to register %s driver\n", name);
+               return -1;
+       }
+
        k = 0;
        if (pg_drive_count == 0) {
                if (pi_init(dev->pi, 1, -1, -1, -1, -1, -1, pg_scratch,
@@ -511,6 +518,7 @@ static int pg_detect(void)
        if (k)
                return 0;
 
+       pi_unregister_driver(par_drv);
        printk("%s: No ATAPI device detected\n", name);
        return -1;
 }