summaryrefslogtreecommitdiffstats
path: root/drivers/net/ucc_geth_mii.c
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2009-03-04 09:11:42 +0100
committerDavid S. Miller <davem@davemloft.net>2009-03-04 09:11:42 +0100
commit858b9ced6e73a0f087294c398a1ae70a7eeed94f (patch)
tree81a2298b2c45d90f68b016fb0b4fa05c19a787f5 /drivers/net/ucc_geth_mii.c
parentnet: fix tokenring license (diff)
downloadlinux-858b9ced6e73a0f087294c398a1ae70a7eeed94f.tar.xz
linux-858b9ced6e73a0f087294c398a1ae70a7eeed94f.zip
net: more timeouts that reach -1
with while (timeout-- > 0); timeout reaches -1 after the loop, so the tests below are off by one. also don't do an '< 0' test on an unsigned. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ucc_geth_mii.c')
-rw-r--r--drivers/net/ucc_geth_mii.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ucc_geth_mii.c b/drivers/net/ucc_geth_mii.c
index 54635911305c..0ada4edd56eb 100644
--- a/drivers/net/ucc_geth_mii.c
+++ b/drivers/net/ucc_geth_mii.c
@@ -107,7 +107,7 @@ int uec_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
static int uec_mdio_reset(struct mii_bus *bus)
{
struct ucc_mii_mng __iomem *regs = (void __iomem *)bus->priv;
- unsigned int timeout = PHY_INIT_TIMEOUT;
+ int timeout = PHY_INIT_TIMEOUT;
mutex_lock(&bus->mdio_lock);
@@ -123,7 +123,7 @@ static int uec_mdio_reset(struct mii_bus *bus)
mutex_unlock(&bus->mdio_lock);
- if (timeout <= 0) {
+ if (timeout < 0) {
printk(KERN_ERR "%s: The MII Bus is stuck!\n", bus->name);
return -EBUSY;
}