gianfar: Fix error in mdio reset timeout
The loop with the timeout used "while (... && timeout--)", which means than when the timeout occurs, "timeout" will be -1 after the loop has exited. The code that checks if the looped exited because of a timeout used "if (timeout <= 0)". Seems ok, except timeout is unsigned, and (unsigned)-1 isn't less than zero! Using "--timeout" in the loop fixes this problem, as now "timeout" will be 0 when the loop times out. This also fixes a bug in the existing code, where it will erroneously think a timeout occurred if the condition the loop was waiting for is satisfied on the final iteration before a timeout. Signed-off-by: Trent Piepho <tpiepho@freescale.com> Acked-by: Andy Fleming <afleming@freescale.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Родитель
2e2e8d53c3
Коммит
baac03d9bb
|
@ -136,12 +136,12 @@ static int gfar_mdio_reset(struct mii_bus *bus)
|
||||||
|
|
||||||
/* Wait until the bus is free */
|
/* Wait until the bus is free */
|
||||||
while ((gfar_read(®s->miimind) & MIIMIND_BUSY) &&
|
while ((gfar_read(®s->miimind) & MIIMIND_BUSY) &&
|
||||||
timeout--)
|
--timeout)
|
||||||
cpu_relax();
|
cpu_relax();
|
||||||
|
|
||||||
mutex_unlock(&bus->mdio_lock);
|
mutex_unlock(&bus->mdio_lock);
|
||||||
|
|
||||||
if(timeout <= 0) {
|
if(timeout == 0) {
|
||||||
printk(KERN_ERR "%s: The MII Bus is stuck!\n",
|
printk(KERN_ERR "%s: The MII Bus is stuck!\n",
|
||||||
bus->name);
|
bus->name);
|
||||||
return -EBUSY;
|
return -EBUSY;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче