diff options
| author |   hayeswang <hayeswang@realtek.com> | 2014-10-09 18:00:24 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-10-09 19:06:07 -0400 |
| commit | 405f8a0ec71c869a374066cce22f88670d27a739 (patch) | |
| tree | f276ea0ade870dd34d2efae03b9b648f4c9630d7 /drivers/net/usb/r8152.c | |
| parent | net: Missing @ before descriptions cause make xmldocs warning (diff) | |
| download | linux-dev-405f8a0ec71c869a374066cce22f88670d27a739.tar.xz linux-dev-405f8a0ec71c869a374066cce22f88670d27a739.zip | |
r8152: autoresume before setting feature
Resume the device before setting the feature.
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/usb/r8152.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 5cfd414b9a3e..c5afe8c85cbc 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -2145,6 +2145,11 @@ static int rtl8152_set_features(struct net_device *dev, { netdev_features_t changed = features ^ dev->features; struct r8152 *tp = netdev_priv(dev); + int ret; + + ret = usb_autopm_get_interface(tp->intf); + if (ret < 0) + goto out; if (changed & NETIF_F_HW_VLAN_CTAG_RX) { if (features & NETIF_F_HW_VLAN_CTAG_RX) @@ -2153,7 +2158,10 @@ static int rtl8152_set_features(struct net_device *dev, rtl_rx_vlan_en(tp, false); } - return 0; + usb_autopm_put_interface(tp->intf); + +out: + return ret; } #define WAKE_ANY (WAKE_PHY | WAKE_MAGIC | WAKE_UCAST | WAKE_BCAST | WAKE_MCAST) |