[2.6.13-rc4-mm1] Fix smsc_ircc_init return value

From: Brice Goglin
Date: Mon Aug 01 2005 - 18:09:58 EST


Hi Andrew,

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

Regards,
Brice
--- linux-mm/drivers/net/irda/smsc-ircc2.c.old 2005-08-01 14:39:21.000000000 +0200
+++ linux-mm/drivers/net/irda/smsc-ircc2.c 2005-08-01 14:51:08.000000000 +0200
@@ -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) {