r8152: autoresume before setting feature
authorhayeswang <hayeswang@realtek.com>
Thu, 9 Oct 2014 10:00:24 +0000 (18:00 +0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 9 Oct 2014 23:06:07 +0000 (19:06 -0400)
Resume the device before setting the feature.

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/r8152.c

index 5cfd414..c5afe8c 100644 (file)
@@ -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)