atheros[ar231x-eth]: merge patch

Merge 3_10-updates.patch into the ar2313_ethernet.patch since it contains
only one ethernet driver fix.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41316 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
John Crispin 2014-06-24 18:13:09 +00:00
parent fca69de306
commit b341c65b7b
2 changed files with 1 additions and 12 deletions

View File

@ -1258,7 +1258,7 @@
+ BUG_ON(phydev->attached_dev); + BUG_ON(phydev->attached_dev);
+ +
+ phydev = phy_connect(dev, dev_name(&phydev->dev), &ar231x_adjust_link, + phydev = phy_connect(dev, dev_name(&phydev->dev), &ar231x_adjust_link,
+ 0, PHY_INTERFACE_MODE_MII); + PHY_INTERFACE_MODE_MII);
+ +
+ if (IS_ERR(phydev)) { + if (IS_ERR(phydev)) {
+ printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name); + printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name);

View File

@ -1,11 +0,0 @@
--- a/drivers/net/ethernet/ar231x/ar231x.c
+++ b/drivers/net/ethernet/ar231x/ar231x.c
@@ -1272,7 +1272,7 @@ static int ar231x_mdiobus_probe(struct n
BUG_ON(phydev->attached_dev);
phydev = phy_connect(dev, dev_name(&phydev->dev), &ar231x_adjust_link,
- 0, PHY_INTERFACE_MODE_MII);
+ PHY_INTERFACE_MODE_MII);
if (IS_ERR(phydev)) {
printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name);