aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2009-02-12 19:42:31 -0500
committerDavid S. Miller <davem@davemloft.net>2009-02-12 19:42:31 -0500
commitfb0886745a75ce98bde3aac421adc69fe61a1905 (patch)
tree8502cf2580bd427656156e4fe20e3fae9d7125ae /drivers/net
parentacdb602fb3b7e13f3ffd2098549fab1bbfccba2f (diff)
IRDA: cnt is off by 1
If no prior break occurs, cnt reaches 101 after the loop, so we are still able to change speed when cnt has become 100. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/irda/mcs7780.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c
index 7eafdca19f34..85e88daab21a 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)
585 mcs_get_reg(mcs, MCS_RESV_REG, &rval); 585 mcs_get_reg(mcs, MCS_RESV_REG, &rval);
586 } while(cnt++ < 100 && (rval & MCS_IRINTX)); 586 } while(cnt++ < 100 && (rval & MCS_IRINTX));
587 587
588 if(cnt >= 100) { 588 if (cnt > 100) {
589 IRDA_ERROR("unable to change speed\n"); 589 IRDA_ERROR("unable to change speed\n");
590 ret = -EIO; 590 ret = -EIO;
591 goto error; 591 goto error;