projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
of: net: pass the dst buffer to of_get_mac_address()
[linux-2.6-microblaze.git]
/
drivers
/
net
/
ethernet
/
wiznet
/
w5100.c
diff --git
a/drivers/net/ethernet/wiznet/w5100.c
b/drivers/net/ethernet/wiznet/w5100.c
index
c0d181a
..
ec5db48
100644
(file)
--- a/
drivers/net/ethernet/wiznet/w5100.c
+++ b/
drivers/net/ethernet/wiznet/w5100.c
@@
-1157,7
+1157,7
@@
int w5100_probe(struct device *dev, const struct w5100_ops *ops,
INIT_WORK(&priv->setrx_work, w5100_setrx_work);
INIT_WORK(&priv->restart_work, w5100_restart_work);
- if (
!IS_ERR_OR_NULL(mac_addr)
)
+ if (
mac_addr
)
memcpy(ndev->dev_addr, mac_addr, ETH_ALEN);
else
eth_hw_addr_random(ndev);