Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux...

[linux-2.6-omap-h63xx.git] / drivers / char / tipar.c

diff --git a/drivers/char/tipar.c b/drivers/char/tipar.c
index 47fb20f696953391c7ce1b10bf248c68a3b60028..35b40b9965344877e113210a7725f6657912abdd 100644 (file)
--- a/drivers/char/tipar.c
+++ b/drivers/char/tipar.c
@@ -442,7 +442,7 @@ tipar_register(int nr, struct parport *port)
        }
 
        class_device_create(tipar_class, NULL, MKDEV(TIPAR_MAJOR,
-                       TIPAR_MINOR + nr), NULL, "par%d", nr);
+                       TIPAR_MINOR + nr), port->dev, "par%d", nr);
 
        /* Display informations */
        pr_info("tipar%d: using %s (%s)\n", nr, port->name, (port->irq ==