From 409d38307289fe67c43d780569b26614f7718526 Mon Sep 17 00:00:00 2001
From: Steve Glendinning <steve.glendinning@smsc.com>
Date: Wed, 4 Mar 2009 07:33:25 +0000
Subject: [PATCH] --- yaml --- r: 135175 b: refs/heads/master c:
 f7efb6ccc2113911e4e064f78bcd0343c4673038 h: refs/heads/master i:   135173:
 fa3134ee543eba9cee393d8ef11b6c5f953e8502   135171:
 7f084bf4d2c247b7d71ef6161d6a4927ea785d11   135167:
 2e3fa839e5d5bbce1870a1480804e1abcc3f411a v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/net/smsc911x.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 20cf37d07bb2..ab8bc20c7be2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8dacd548129d03e87751f75ea83b42a8a17ee651
+refs/heads/master: f7efb6ccc2113911e4e064f78bcd0343c4673038
diff --git a/trunk/drivers/net/smsc911x.c b/trunk/drivers/net/smsc911x.c
index 9a795105cc7c..ad15aab2137d 100644
--- a/trunk/drivers/net/smsc911x.c
+++ b/trunk/drivers/net/smsc911x.c
@@ -1162,8 +1162,8 @@ static int smsc911x_open(struct net_device *dev)
 
 	/* Make sure EEPROM has finished loading before setting GPIO_CFG */
 	timeout = 50;
-	while ((timeout--) &&
-	       (smsc911x_reg_read(pdata, E2P_CMD) & E2P_CMD_EPC_BUSY_)) {
+	while ((smsc911x_reg_read(pdata, E2P_CMD) & E2P_CMD_EPC_BUSY_) &&
+	       --timeout) {
 		udelay(10);
 	}