diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-05 19:19:06 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-05 19:19:06 -0400 |
| commit | b4874a3d298606c20118d1ead73235439bbc2823 (patch) | |
| tree | 0b6122df3a52650c7861c8e505c01fc381bc43e8 /drivers/net/ethernet/pasemi | |
| parent | ceaa1a13c0e53242555fa45887d82339a3f93c78 (diff) | |
| parent | 8ef102c6b4bc996ff96ca52b34775fe931ec90c9 (diff) | |
Merge branch 'fixes' into for-linus
Diffstat (limited to 'drivers/net/ethernet/pasemi')
| -rw-r--r-- | drivers/net/ethernet/pasemi/pasemi_mac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.c b/drivers/net/ethernet/pasemi/pasemi_mac.c index e559dfa06d6..6fa74d530e4 100644 --- a/drivers/net/ethernet/pasemi/pasemi_mac.c +++ b/drivers/net/ethernet/pasemi/pasemi_mac.c | |||
| @@ -1101,9 +1101,9 @@ static int pasemi_mac_phy_init(struct net_device *dev) | |||
| 1101 | phydev = of_phy_connect(dev, phy_dn, &pasemi_adjust_link, 0, | 1101 | phydev = of_phy_connect(dev, phy_dn, &pasemi_adjust_link, 0, |
| 1102 | PHY_INTERFACE_MODE_SGMII); | 1102 | PHY_INTERFACE_MODE_SGMII); |
| 1103 | 1103 | ||
| 1104 | if (IS_ERR(phydev)) { | 1104 | if (!phydev) { |
| 1105 | printk(KERN_ERR "%s: Could not attach to phy\n", dev->name); | 1105 | printk(KERN_ERR "%s: Could not attach to phy\n", dev->name); |
| 1106 | return PTR_ERR(phydev); | 1106 | return -ENODEV; |
| 1107 | } | 1107 | } |
| 1108 | 1108 | ||
| 1109 | mac->phydev = phydev; | 1109 | mac->phydev = phydev; |