From: T-Firefly <account@t-firefly.com>
Date: Sat, 19 Aug 2017 08:26:44 +0000 (+0800)
Subject: Merge branch 'firefly' into squashCM
X-Git-Tag: release-20171130_firefly~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=03452962acf3c6afc8a311079b7687e0c9a57a56;p=firefly-linux-kernel-4.4.55.git

Merge branch 'firefly' into squashCM

Change-Id: I53c4317c04c651aabdd91052263e64adef55bd5c
---

03452962acf3c6afc8a311079b7687e0c9a57a56
diff --cc drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
index 0109c48f1533,3080502e79de..a471018a5e9f
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
@@@ -1048,11 -1077,12 +1077,12 @@@ void rk_get_eth_addr(void *priv, unsign
  		if (ret != 0)
  			dev_err(dev, "%s: rk_vendor_write eth mac address failed (%d)",
  					__func__, ret);
- 	} else {
- 		dev_dbg(dev, "%s: rk_vendor_read eth mac address: %02x:%02x:%02x:%02x:%02x:%02x",
- 					__func__, addr[0], addr[1], addr[2],
- 					addr[3], addr[4], addr[5]);
  	}
+ 
+ out:
 -	dev_err(dev, "%s: mac address: %02x:%02x:%02x:%02x:%02x:%02x",
++	dev_dbg(dev, "%s: mac address: %02x:%02x:%02x:%02x:%02x:%02x",
+ 				__func__, addr[0], addr[1], addr[2],
+ 				addr[3], addr[4], addr[5]);
  }
  
  static int rk_gmac_probe(struct platform_device *pdev)