aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/sungem.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-03-10 15:17:26 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-03-10 15:17:26 +0900
commite161183ba674f97fce748384f5bb037d07bdc5c9 (patch)
tree5b3bd4b995f6435ee977b71082244fa1a647f717 /drivers/net/sungem.c
parent2ef7f0dab6b3d171b6aff00a47077385ae3155b5 (diff)
parent99adcd9d67aaf04e28f5ae96df280f236bde4b66 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/sungem.c')
-rw-r--r--drivers/net/sungem.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 49187634106..0fcb7503363 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -1157,7 +1157,7 @@ static void gem_pcs_reset(struct gem *gp)
if (limit-- <= 0)
break;
}
- if (limit <= 0)
+ if (limit < 0)
printk(KERN_WARNING "%s: PCS reset bit would not clear.\n",
gp->dev->name);
}
@@ -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)