summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2006-12-08 02:39:06 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 08:28:58 -0800
commit7eb9976f10354f0e3bc1a52b66b9cf857ff41088 (patch)
tree8a9f9bb93a1d3bca8e33de4a7c3183c9288deece /drivers/char
parentc9594643c095da0a0ad4d5f0a1ff357a84e91524 (diff)
[PATCH] Char: sx, fix return in module init
If pci_register_driver fails, but eisa_driver_register doesn't, we don't call misc_deregister, but returns error. Return OK in such cases. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/sx.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index 0122b2d93312..f506ee3243d1 100644
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -2791,6 +2791,7 @@ static int __init sx_init(void)
retval = 0;
} else if (retval) {
#ifdef CONFIG_EISA
+ retval = retval1;
if (retval1)
#endif
misc_deregister(&sx_fw_device);