diff --git a/[refs] b/[refs] index f9a5b21cd952..2ccb5b82236e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89c581b3fb2986e303f1299e6458e3e9b115fa3f +refs/heads/master: d4675b52a933831d4901217564cba5a434ddd922 diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index 8b3f84685387..4595962fb8e1 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -852,7 +852,7 @@ static int tg3_bmcr_reset(struct tg3 *tp) } udelay(10); } - if (limit <= 0) + if (limit < 0) return -EBUSY; return 0; @@ -1603,7 +1603,7 @@ static int tg3_wait_macro_done(struct tg3 *tp) break; } } - if (limit <= 0) + if (limit < 0) return -EBUSY; return 0;