r8152: autoresume before setting MAC address

Resume the device before setting the MAC address.

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

diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 604ef210a4dea5f8e8bd9b543b3dc4156b357286..5ee75827bd364eee3dda240849bb1ef2ae162e3b 100644 (file)
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -1007,9 +1007,14 @@ static int rtl8152_set_mac_address(struct net_device *netdev, void *p)
 {
        struct r8152 *tp = netdev_priv(netdev);
        struct sockaddr *addr = p;
+       int ret = -EADDRNOTAVAIL;
 
        if (!is_valid_ether_addr(addr->sa_data))
-               return -EADDRNOTAVAIL;
+               goto out1;
+
+       ret = usb_autopm_get_interface(tp->intf);
+       if (ret < 0)
+               goto out1;
 
        memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
 
@@ -1017,7 +1022,9 @@ static int rtl8152_set_mac_address(struct net_device *netdev, void *p)
        pla_ocp_write(tp, PLA_IDR, BYTE_EN_SIX_BYTES, 8, addr->sa_data);
        ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML);
 
-       return 0;
+       usb_autopm_put_interface(tp->intf);
+out1:
+       return ret;
 }
 
 static void read_bulk_callback(struct urb *urb)