From 6a211916f593188b13ed1642413d7466d184dc1c Mon Sep 17 00:00:00 2001 From: roel kluin Date: Sun, 27 Dec 2009 11:22:08 +0000 Subject: [PATCH] --- yaml --- r: 179079 b: refs/heads/master c: c064efca9211d12bb9e6de8718fc39884eb883f2 h: refs/heads/master i: 179077: 29b178261a698bb2c8350da062293b1be83ce0aa 179075: 8ccfc5cc1ecf2a7021d592ba7a1d506a9935ccf3 179071: 268e057ac71e58751f19842ccff9c40416236e2e v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/rtl8150.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cb96b8b6e9ef..5d3177997c6c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce739b473ce12d5ef067b39b8637bfd2b2174a15 +refs/heads/master: c064efca9211d12bb9e6de8718fc39884eb883f2 diff --git a/trunk/drivers/net/usb/rtl8150.c b/trunk/drivers/net/usb/rtl8150.c index f14d225404da..fd19db0d2504 100644 --- a/trunk/drivers/net/usb/rtl8150.c +++ b/trunk/drivers/net/usb/rtl8150.c @@ -270,7 +270,7 @@ static int read_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 * reg) get_registers(dev, PHYCNT, 1, data); } while ((data[0] & PHY_GO) && (i++ < MII_TIMEOUT)); - if (i < MII_TIMEOUT) { + if (i <= MII_TIMEOUT) { get_registers(dev, PHYDAT, 2, data); *reg = data[0] | (data[1] << 8); return 0; @@ -295,7 +295,7 @@ static int write_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 reg) get_registers(dev, PHYCNT, 1, data); } while ((data[0] & PHY_GO) && (i++ < MII_TIMEOUT)); - if (i < MII_TIMEOUT) + if (i <= MII_TIMEOUT) return 0; else return 1;