Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c

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)
                 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;