Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 374807
b: refs/heads/master
c: 2c00699
h: refs/heads/master
i:
  374805: 18c30d3
  374803: e125fe3
  374799: e25120f
v: v3
  • Loading branch information
Wei Yongjun authored and David S. Miller committed May 8, 2013
1 parent 4233fbe commit cc05f6a
Show file tree
Hide file tree
Showing 2 changed files with 3 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: 155d940a78fd0761c2d73c5bd95a9dd287d58054
refs/heads/master: 2c006994520f3a4bb1d47a6afe5c58ff856497ce
3 changes: 2 additions & 1 deletion trunk/drivers/net/ethernet/adi/bfin_mac.c
Original file line number Diff line number Diff line change
Expand Up @@ -1700,7 +1700,8 @@ static int bfin_mac_probe(struct platform_device *pdev)
}

bfin_mac_hwtstamp_init(ndev);
if (bfin_phc_init(ndev, &pdev->dev)) {
rc = bfin_phc_init(ndev, &pdev->dev);
if (rc) {
dev_err(&pdev->dev, "Cannot register PHC device!\n");
goto out_err_phc;
}
Expand Down

0 comments on commit cc05f6a

Please sign in to comment.