|
@@ -1007,9 +1007,14 @@ static int rtl8152_set_mac_address(struct net_device *netdev, void *p)
|
|
{
|
|
{
|
|
struct r8152 *tp = netdev_priv(netdev);
|
|
struct r8152 *tp = netdev_priv(netdev);
|
|
struct sockaddr *addr = p;
|
|
struct sockaddr *addr = p;
|
|
|
|
+ int ret = -EADDRNOTAVAIL;
|
|
|
|
|
|
if (!is_valid_ether_addr(addr->sa_data))
|
|
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);
|
|
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);
|
|
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);
|
|
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)
|
|
static void read_bulk_callback(struct urb *urb)
|