From: Jiri Slaby <jirislaby@gmail.com>
Date: Fri, 8 Dec 2006 10:39:06 +0000 (-0800)
Subject: [PATCH] Char: sx, fix return in module init
X-Git-Tag: v2.6.20-rc1~34^2~177
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7eb9976f10354f0e3bc1a52b66b9cf857ff41088;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index 0122b2d9331..f506ee3243d 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);