From: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Tue, 6 Sep 2005 22:19:25 +0000 (-0700)
Subject: [PATCH] Fix smsc_ircc_init return value
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=505db03639db34ca2c64fe7ee27190d324281f2c;p=openwrt%2Fstaging%2Fblogic.git

[PATCH] Fix smsc_ircc_init return value

I noticed a strange return value in smsc_ircc_init in
drivers/net/irda/smsc_ircc2.c in rc4-mm1.

When reaching the line "if (ircc_fir > 0 && ircc_sir > 0)", ret is 0.  So I
don't see the point of setting it to 0 in the "else" case.  >From what I
see in 2.6.12 it should probably be set to -ENODEV at the begining of the
"else" case.  The attached patch does this.

Note that I didn't actually see any breakage caused by this.

Signed-off-by: Brice Goglin <Brice.Goglin@ens-lyon.org>
Cc: Dmitry Torokhov <dtor_core@ameritech.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index 2c9d3309314c..dd89bda1f131 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -360,6 +360,7 @@ static int __init smsc_ircc_init(void)
 		if (smsc_ircc_open(ircc_fir, ircc_sir, ircc_dma, ircc_irq))
 			ret = -ENODEV;
 	} else {
+		ret = -ENODEV;
 
 		/* try user provided configuration register base address */
 		if (ircc_cfg > 0) {