From: David S. Miller <davem@davemloft.net>
Date: Wed, 8 Oct 2014 20:22:22 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=64b1f00a0830e1c53874067273a096b228d83d36;p=linux-beck.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
---

64b1f00a0830e1c53874067273a096b228d83d36
diff --cc drivers/net/usb/r8152.c
index 65326204baa0,5ee75827bd36..5cfd414b9a3e
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@@ -990,40 -1022,11 +995,42 @@@ static int rtl8152_set_mac_address(stru
  	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 int set_ethernet_addr(struct r8152 *tp)
 +{
 +	struct net_device *dev = tp->netdev;
 +	struct sockaddr sa;
 +	int ret;
 +
 +	if (tp->version == RTL_VER_01)
 +		ret = pla_ocp_read(tp, PLA_IDR, 8, sa.sa_data);
 +	else
 +		ret = pla_ocp_read(tp, PLA_BACKUP, 8, sa.sa_data);
 +
 +	if (ret < 0) {
 +		netif_err(tp, probe, dev, "Get ether addr fail\n");
 +	} else if (!is_valid_ether_addr(sa.sa_data)) {
 +		netif_err(tp, probe, dev, "Invalid ether addr %pM\n",
 +			  sa.sa_data);
 +		eth_hw_addr_random(dev);
 +		ether_addr_copy(sa.sa_data, dev->dev_addr);
 +		ret = rtl8152_set_mac_address(dev, &sa);
 +		netif_info(tp, probe, dev, "Random ether addr %pM\n",
 +			   sa.sa_data);
 +	} else {
 +		if (tp->version == RTL_VER_01)
 +			ether_addr_copy(dev->dev_addr, sa.sa_data);
 +		else
 +			ret = rtl8152_set_mac_address(dev, &sa);
 +	}
 +
 +	return ret;
 +}
 +
  static void read_bulk_callback(struct urb *urb)
  {
  	struct net_device *netdev;