diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-03-05 02:06:47 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-05 02:06:47 -0800 |
| commit | 508827ff0ac3981d420edac64a70de7f4e304d38 (patch) | |
| tree | b0cee8ddef9f0ceab68c388e4ae46b7295eb2cb5 /drivers/net/fsl_pq_mdio.c | |
| parent | sfc: Improve NIC internal error recovery (diff) | |
| parent | bonding: Fix device passed into ->ndo_neigh_setup(). (diff) | |
| download | linux-dev-508827ff0ac3981d420edac64a70de7f4e304d38.tar.xz linux-dev-508827ff0ac3981d420edac64a70de7f4e304d38.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tokenring/tmspci.c
drivers/net/ucc_geth_mii.c
Diffstat (limited to 'drivers/net/fsl_pq_mdio.c')
| -rw-r--r-- | drivers/net/fsl_pq_mdio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/fsl_pq_mdio.c b/drivers/net/fsl_pq_mdio.c index c434a156d7a9..b0ce1445d4a8 100644 --- a/drivers/net/fsl_pq_mdio.c +++ b/drivers/net/fsl_pq_mdio.c @@ -129,7 +129,7 @@ int fsl_pq_mdio_read(struct mii_bus *bus, int mii_id, int regnum) static int fsl_pq_mdio_reset(struct mii_bus *bus) { struct fsl_pq_mdio __iomem *regs = (void __iomem *)bus->priv; - unsigned int timeout = PHY_INIT_TIMEOUT; + int timeout = PHY_INIT_TIMEOUT; mutex_lock(&bus->mdio_lock); @@ -145,7 +145,7 @@ static int fsl_pq_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; |