diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
| commit | e70049b9e74267dd47e1ffa62302073487afcb48 (patch) | |
| tree | 2cd000c0751ef31c9044b020d63f278cdf4f332d /drivers/net/sungem.c | |
| parent | d18921a0e319ab512f8186b1b1142c7b8634c779 (diff) | |
| parent | f7e603ad8f78cd3b59e33fa72707da0cbabdf699 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/sungem.c')
| -rw-r--r-- | drivers/net/sungem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 5322bb79b2b5..c3e6aa137cdf 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c | |||
| @@ -1157,7 +1157,7 @@ static void gem_pcs_reset(struct gem *gp) | |||
| 1157 | if (limit-- <= 0) | 1157 | if (limit-- <= 0) |
| 1158 | break; | 1158 | break; |
| 1159 | } | 1159 | } |
| 1160 | if (limit <= 0) | 1160 | if (limit < 0) |
| 1161 | printk(KERN_WARNING "%s: PCS reset bit would not clear.\n", | 1161 | printk(KERN_WARNING "%s: PCS reset bit would not clear.\n", |
| 1162 | gp->dev->name); | 1162 | gp->dev->name); |
| 1163 | } | 1163 | } |