diff options
| author | David S. Miller <davem@davemloft.net> | 2015-11-03 21:41:45 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-03 21:41:45 +0300 |
| commit | 73186df8d7fa574345f0ad626ebe89649f8308a5 (patch) | |
| tree | 9e6ed2c499cb5cbbcc79415602f9114503bb6931 /drivers/net/ethernet/smsc | |
| parent | 0c63d80c3fac4e6eb0f01dff756e47bc7cd50092 (diff) | |
| parent | ebac62fe3d24c0ce22dd83afa7b07d1a2aaef44d (diff) | |
| download | linux-73186df8d7fa574345f0ad626ebe89649f8308a5.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor overlapping changes in net/ipv4/ipmr.c, in 'net' we were
fixing the "BH-ness" of the counter bumps whilst in 'net-next'
the functions were modified to take an explicit 'net' parameter.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/smsc')
| -rw-r--r-- | drivers/net/ethernet/smsc/smsc911x.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index 3b4cd8a263de..c860c9007e49 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c @@ -1052,6 +1052,7 @@ static int smsc911x_mii_probe(struct net_device *dev) #ifdef USE_PHY_WORK_AROUND if (smsc911x_phy_loopbacktest(dev) < 0) { SMSC_WARN(pdata, hw, "Failed Loop Back Test"); + phy_disconnect(phydev); return -ENODEV; } SMSC_TRACE(pdata, hw, "Passed Loop Back Test"); |