diff --git a/[refs] b/[refs] index 778e0896d858..842321960bd0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 948731115774c2e5ff7409360f35389459502211 +refs/heads/master: 4a8fd2cfdad4d043a1fadba2f3f340945d966825 diff --git a/trunk/drivers/net/sungem.c b/trunk/drivers/net/sungem.c index 8d64b1da0465..0fcb7503363d 100644 --- a/trunk/drivers/net/sungem.c +++ b/trunk/drivers/net/sungem.c @@ -1229,7 +1229,7 @@ static void gem_reset(struct gem *gp) break; } while (val & (GREG_SWRST_TXRST | GREG_SWRST_RXRST)); - if (limit <= 0) + if (limit < 0) printk(KERN_ERR "%s: SW reset is ghetto.\n", gp->dev->name); if (gp->phy_type == phy_serialink || gp->phy_type == phy_serdes)