summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2009-05-13 20:37:54 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-19 11:00:51 -0700
commitf991a65c0cb8eaf855404a0e6c753053de08cdda (patch)
tree7b5acc7b2b8b9a28bb4715e04934cf714662cf10
parent8d72f98abbabddd5785a668e0d24db3e739f78b4 (diff)
downloadop-kernel-dev-f991a65c0cb8eaf855404a0e6c753053de08cdda.zip
op-kernel-dev-f991a65c0cb8eaf855404a0e6c753053de08cdda.tar.gz
staging: rtlxxxx: off by one in AsicSendCommandToMcu() and NDIS_STATUS NICLoadFirmware()
With a postfix increment i/Index is incremented beyond 100/1000 so the message will be displayed too soon. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/rt2860/common/mlme.c2
-rw-r--r--drivers/staging/rt2860/common/rtmp_init.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c
index e9e69c5..bb6fccb 100644
--- a/drivers/staging/rt2860/common/mlme.c
+++ b/drivers/staging/rt2860/common/mlme.c
@@ -7866,7 +7866,7 @@ BOOLEAN AsicSendCommandToMcu(
RTMPusecDelay(2);
} while(i++ < 100);
- if (i >= 100)
+ if (i > 100)
{
{
#ifdef RT2860
diff --git a/drivers/staging/rt2860/common/rtmp_init.c b/drivers/staging/rt2860/common/rtmp_init.c
index c2facac..004f530 100644
--- a/drivers/staging/rt2860/common/rtmp_init.c
+++ b/drivers/staging/rt2860/common/rtmp_init.c
@@ -3366,7 +3366,7 @@ NDIS_STATUS NICLoadFirmware(
RTMPusecDelay(1000);
} while (Index++ < 1000);
- if (Index >= 1000)
+ if (Index > 1000)
{
Status = NDIS_STATUS_FAILURE;
DBGPRINT(RT_DEBUG_ERROR, ("NICLoadFirmware: MCU is not ready\n\n\n"));
OpenPOWER on IntegriCloud