summaryrefslogtreecommitdiffstats
path: root/drivers/net/usb/r8152.c
diff options
context:
space:
mode:
authorhayeswang <hayeswang@realtek.com>2014-10-02 17:03:12 +0800
committerDavid S. Miller <davem@davemloft.net>2014-10-03 15:40:28 -0700
commitea6a7112d8525f7b5b6fdd59b255845ed6331beb (patch)
treeec0019eb49ea05a2df376cefc2e569aea62653f1 /drivers/net/usb/r8152.c
parent3cc81d85ee01e5a0b7ea2f4190e2ed1165f53c31 (diff)
downloadtalos-op-linux-ea6a7112d8525f7b5b6fdd59b255845ed6331beb.tar.gz
talos-op-linux-ea6a7112d8525f7b5b6fdd59b255845ed6331beb.zip
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>
Diffstat (limited to 'drivers/net/usb/r8152.c')
-rw-r--r--drivers/net/usb/r8152.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 604ef210a4de..5ee75827bd36 100644
--- 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)
OpenPOWER on IntegriCloud