diff options
author | hayeswang <hayeswang@realtek.com> | 2014-10-09 06:00:24 -0400 |
---|---|---|
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 | de3f0d0effecc2ccfbd679705519ed5b35f9cb33 (diff) |
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 'drivers/net/usb/r8152.c')
-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, | |||
2145 | { | 2145 | { |
2146 | netdev_features_t changed = features ^ dev->features; | 2146 | netdev_features_t changed = features ^ dev->features; |
2147 | struct r8152 *tp = netdev_priv(dev); | 2147 | struct r8152 *tp = netdev_priv(dev); |
2148 | int ret; | ||
2149 | |||
2150 | ret = usb_autopm_get_interface(tp->intf); | ||
2151 | if (ret < 0) | ||
2152 | goto out; | ||
2148 | 2153 | ||
2149 | if (changed & NETIF_F_HW_VLAN_CTAG_RX) { | 2154 | if (changed & NETIF_F_HW_VLAN_CTAG_RX) { |
2150 | if (features & NETIF_F_HW_VLAN_CTAG_RX) | 2155 | if (features & NETIF_F_HW_VLAN_CTAG_RX) |
@@ -2153,7 +2158,10 @@ static int rtl8152_set_features(struct net_device *dev, | |||
2153 | rtl_rx_vlan_en(tp, false); | 2158 | rtl_rx_vlan_en(tp, false); |
2154 | } | 2159 | } |
2155 | 2160 | ||
2156 | return 0; | 2161 | usb_autopm_put_interface(tp->intf); |
2162 | |||
2163 | out: | ||
2164 | return ret; | ||
2157 | } | 2165 | } |
2158 | 2166 | ||
2159 | #define WAKE_ANY (WAKE_PHY | WAKE_MAGIC | WAKE_UCAST | WAKE_BCAST | WAKE_MCAST) | 2167 | #define WAKE_ANY (WAKE_PHY | WAKE_MAGIC | WAKE_UCAST | WAKE_BCAST | WAKE_MCAST) |