From 6dd9a1080ae8ef8a0ebb5f8a5f8557f4c1024b6d Mon Sep 17 00:00:00 2001
From: Wu Fengguang <wfg@linux.intel.com>
Date: Tue, 6 Jan 2009 18:52:58 +0000
Subject: [PATCH] --- yaml --- r: 127825 b: refs/heads/master c:
 4b9f8ec6e5e98779e8b3806a5f58267378ef57eb h: refs/heads/master i:   127823:
 0866fef7c10487e78c636a6f0a68c57ca118e3ec v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/usb/dm9601.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 932e0f9de85a..d4ea55aaa3c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 684f2176015b313ab59cecf574117969cf638f28
+refs/heads/master: 4b9f8ec6e5e98779e8b3806a5f58267378ef57eb
diff --git a/trunk/drivers/net/usb/dm9601.c b/trunk/drivers/net/usb/dm9601.c
index 49a30bde7a89..63e97a387085 100644
--- a/trunk/drivers/net/usb/dm9601.c
+++ b/trunk/drivers/net/usb/dm9601.c
@@ -397,6 +397,11 @@ static void dm9601_set_multicast(struct net_device *net)
 	dm_write_reg_async(dev, DM_RX_CTRL, rx_ctl);
 }
 
+static void __dm9601_set_mac_address(struct usbnet *dev)
+{
+	dm_write_async(dev, DM_PHY_ADDR, ETH_ALEN, dev->net->dev_addr);
+}
+
 static int dm9601_set_mac_address(struct net_device *net, void *p)
 {
 	struct sockaddr *addr = p;
@@ -406,7 +411,7 @@ static int dm9601_set_mac_address(struct net_device *net, void *p)
 		return -EINVAL;
 
 	memcpy(net->dev_addr, addr->sa_data, net->addr_len);
-	dm_write_async(dev, DM_PHY_ADDR, net->addr_len, net->dev_addr);
+	__dm9601_set_mac_address(dev);
 
 	return 0;
 }
@@ -450,6 +455,8 @@ static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf)
 	 */
 	if (is_valid_ether_addr(mac))
 		memcpy(dev->net->dev_addr, mac, ETH_ALEN);
+	else
+		__dm9601_set_mac_address(dev);
 
 	/* power up phy */
 	dm_write_reg(dev, DM_GPR_CTRL, 1);