From eba68e2a71558ada05d313d8e26e4dca691a2951 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Fri, 8 Dec 2006 02:39:06 -0800
Subject: [PATCH] --- yaml --- r: 43712 b: refs/heads/master c:
 7eb9976f10354f0e3bc1a52b66b9cf857ff41088 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/char/sx.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 666b3df2c8df..79ebca03c449 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9594643c095da0a0ad4d5f0a1ff357a84e91524
+refs/heads/master: 7eb9976f10354f0e3bc1a52b66b9cf857ff41088
diff --git a/trunk/drivers/char/sx.c b/trunk/drivers/char/sx.c
index 0122b2d93312..f506ee3243d1 100644
--- a/trunk/drivers/char/sx.c
+++ b/trunk/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);