Patchwork SMSC: timeout reaches -1

login
register
mail settings
Submitter roel kluin
Date Feb. 20, 2009, 8:51 a.m.
Message ID <499E6F18.4080503@gmail.com>
Download mbox | patch
Permalink /patch/23475/
State Accepted
Headers show

Comments

roel kluin - Feb. 20, 2009, 8:51 a.m.
David Miller wrote:
> From: Roel Kluin <roel.kluin@gmail.com>
> Date: Mon, 16 Feb 2009 11:21:33 +0100
> 
>> With a postfix decrement timeouts will reach -1 rather than 0, so
>> the error path does not appear.
>>
>> Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
> 
> Steve Glendinning submitted the smsc9420 side of this patch,
> please resubmit this with only the smsc911x.c part present.
> 
> Thanks.
> 
ok, here:

--------------------------->8-------------8<------------------------------
With a postfix decrement timeouts will reach -1 rather than 0, so
the error path does not appear.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Feb. 20, 2009, 8:52 a.m.
From: Roel Kluin <roel.kluin@gmail.com>
Date: Fri, 20 Feb 2009 09:51:36 +0100

> With a postfix decrement timeouts will reach -1 rather than 0, so
> the error path does not appear.
> 
> Signed-off-by: Roel Kluin <roel.kluin@gmail.com>

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c
index 783c1a7..9a78dae 100644
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/smsc911x.c
@@ -1624,7 +1624,7 @@  static int smsc911x_eeprom_send_cmd(struct smsc911x_data *pdata, u32 op)
 	do {
 		msleep(1);
 		e2cmd = smsc911x_reg_read(pdata, E2P_CMD);
-	} while ((e2cmd & E2P_CMD_EPC_BUSY_) && (timeout--));
+	} while ((e2cmd & E2P_CMD_EPC_BUSY_) && (--timeout));
 
 	if (!timeout) {
 		SMSC_TRACE(DRV, "TIMED OUT");