summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Drake <dsd@gentoo.org>2006-04-27 18:39:19 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-28 08:33:46 -0700
commit1ac3836ce689e594b20c7c9855f64a63751c2d10 (patch)
tree6482a2b6f943a7e08e958428d3ddf6a4dde61ed1
parent13e87ec68641fd54f3fa04eef3419d034ed2115a (diff)
downloadlinux-3.10-1ac3836ce689e594b20c7c9855f64a63751c2d10.tar.gz
linux-3.10-1ac3836ce689e594b20c7c9855f64a63751c2d10.tar.bz2
linux-3.10-1ac3836ce689e594b20c7c9855f64a63751c2d10.zip
[PATCH] tipar oops fix
If compiled into the kernel, parport_register_driver() is called before the parport driver has been initalised. This means that it is expected that tp_count is 0 after the parport_register_driver() call() - tipar's attach function will not be called until later during bootup. Signed-off-by: Daniel Drake <dsd@gentoo.org> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/char/tipar.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tipar.c b/drivers/char/tipar.c
index eb2eb3e12d6..079db5a935a 100644
--- a/drivers/char/tipar.c
+++ b/drivers/char/tipar.c
@@ -515,7 +515,7 @@ tipar_init_module(void)
err = PTR_ERR(tipar_class);
goto out_chrdev;
}
- if (parport_register_driver(&tipar_driver) || tp_count == 0) {
+ if (parport_register_driver(&tipar_driver)) {
printk(KERN_ERR "tipar: unable to register with parport\n");
err = -EIO;
goto out_class;