From: Jiri Slaby <jirislaby@gmail.com>

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

 drivers/char/sx.c |    1 +
 1 file changed, 1 insertion(+)

diff -puN drivers/char/sx.c~char-sx-fix-return-in-module-init drivers/char/sx.c
--- a/drivers/char/sx.c~char-sx-fix-return-in-module-init
+++ a/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);
_