Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 74727
b: refs/heads/master
c: 9685306
h: refs/heads/master
i:
  74725: 695c410
  74723: 60b97b8
  74719: 865c0fd
v: v3
  • Loading branch information
Benjamin Herrenschmidt authored and Jeff Garzik committed Dec 7, 2007
1 parent a00fad2 commit d8e6e29
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8df4538e21f7313a29fa6c5af78c08a135d44738
refs/heads/master: 968530643a0685caced9dfd6f72f20d5e7bc8fbb
4 changes: 3 additions & 1 deletion trunk/drivers/net/ibm_newemac/zmii.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,14 @@ int __devinit zmii_attach(struct of_device *ofdev, int input, int *mode)

ZMII_DBG(dev, "init(%d, %d)" NL, input, *mode);

if (!zmii_valid_mode(*mode))
if (!zmii_valid_mode(*mode)) {
/* Probably an EMAC connected to RGMII,
* but it still may need ZMII for MDIO so
* we don't fail here.
*/
dev->users++;
return 0;
}

mutex_lock(&dev->lock);

Expand Down

0 comments on commit d8e6e29

Please sign in to comment.