diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-06 12:03:08 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-06 12:03:08 +0800 |
| commit | 1e96b17b74a5690ee21d95b59722ecc124fee738 (patch) | |
| tree | fc63fd332f418eb5dac357d4cbd6ca6d776337b6 /net/dsa/slave.c | |
| parent | 5bee6fb934ecb5c3eac5aa05b3c39505a4c130ad (diff) | |
| parent | d69f58e2b8396658b7577113f9887bd4d66d25f8 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'net/dsa/slave.c')
| -rw-r--r-- | net/dsa/slave.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 7bc787b095c8..8dfe9fb7ad36 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1101,6 +1101,8 @@ int dsa_slave_suspend(struct net_device *slave_dev) { struct dsa_slave_priv *p = netdev_priv(slave_dev); + netif_device_detach(slave_dev); + if (p->phy) { phy_stop(p->phy); p->old_pause = -1; |