Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
This commit is contained in:
commit
e70049b9e7
380 changed files with 10886 additions and 2118 deletions
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue