[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <4992A214.2040300@gmail.com>
Date: Wed, 11 Feb 2009 11:01:56 +0100
From: Roel Kluin <roel.kluin@...il.com>
To: "David S. Miller" <davem@...emloft.net>
CC: netdev@...r.kernel.org, Andrew Morton <akpm@...ux-foundation.org>
Subject: [PATCH] net: off by one, try #2
Better?
-------------------->8----------------8<-----------------------
With while (x++ < n) { ... } x can reach n+1.
Signed-off-by: Roel Kluin <roel.kluin@...il.com>
---
drivers/net/3c505.c | 4 ++--
drivers/net/irda/mcs7780.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c
index 6124605..fb74846 100644
--- a/drivers/net/3c505.c
+++ b/drivers/net/3c505.c
@@ -500,9 +500,9 @@ static bool receive_pcb(struct net_device *dev, pcb_struct * pcb)
pcb->data.raw[i++] = inb_command(dev->base_addr);
if (i > MAX_PCB_DATA)
INVALID_PCB_MSG(i);
- } while ((stat & ASF_PCB_MASK) != ASF_PCB_END && j < 20000);
+ } while ((stat & ASF_PCB_MASK) != ASF_PCB_END && j <= 20000);
spin_unlock_irqrestore(&adapter->lock, flags);
- if (j >= 20000) {
+ if (j > 20000) {
TIMEOUT_MSG(__LINE__);
return false;
}
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c
index 7eafdca..b4f4f19 100644
--- a/drivers/net/irda/mcs7780.c
+++ b/drivers/net/irda/mcs7780.c
@@ -585,7 +585,7 @@ static int mcs_speed_change(struct mcs_cb *mcs)
mcs_get_reg(mcs, MCS_RESV_REG, &rval);
} while(cnt++ < 100 && (rval & MCS_IRINTX));
- if(cnt >= 100) {
+ if(cnt > 100) {
IRDA_ERROR("unable to change speed\n");
ret = -EIO;
goto error;
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists