aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/mach-bf527/boards/tll6527m.c
diff options
context:
space:
mode:
authorDanny Kukawka <danny.kukawka@bisect.de>2012-02-16 02:09:30 -0500
committerDavid S. Miller <davem@davemloft.net>2012-02-19 19:02:42 -0500
commitfa63c6da22b4a6ea6e7d04e3dc9178dd72304903 (patch)
tree6b3ece0cb2f9648c04089ed610e823cd96af258d /arch/blackfin/mach-bf527/boards/tll6527m.c
parent772301b6187a88359b9514bdd023becf31e7f013 (diff)
arch/blackfin: don't generate random mac in bfin_get_ether_addr()
Changed bfin_get_ether_addr() to return a state and to set no random mac address if the board don't provide one. Let the caller of bfin_get_ether_addr() set a random mac address if the return value is not 0. v2: don't set random mac in bfin_get_ether_addr() Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de> Acked-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/blackfin/mach-bf527/boards/tll6527m.c')
-rw-r--r--arch/blackfin/mach-bf527/boards/tll6527m.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/blackfin/mach-bf527/boards/tll6527m.c b/arch/blackfin/mach-bf527/boards/tll6527m.c
index 360e97fc5293..d192c0ac941c 100644
--- a/arch/blackfin/mach-bf527/boards/tll6527m.c
+++ b/arch/blackfin/mach-bf527/boards/tll6527m.c
@@ -931,7 +931,7 @@ void native_machine_restart(char *cmd)
931 bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS); 931 bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);
932} 932}
933 933
934void bfin_get_ether_addr(char *addr) 934int bfin_get_ether_addr(char *addr)
935{ 935{
936 /* the MAC is stored in OTP memory page 0xDF */ 936 /* the MAC is stored in OTP memory page 0xDF */
937 u32 ret; 937 u32 ret;
@@ -945,5 +945,6 @@ void bfin_get_ether_addr(char *addr)
945 for (ret = 0; ret < 6; ++ret) 945 for (ret = 0; ret < 6; ++ret)
946 addr[ret] = otp_mac_p[5 - ret]; 946 addr[ret] = otp_mac_p[5 - ret];
947 } 947 }
948 return 0;
948} 949}
949EXPORT_SYMBOL(bfin_get_ether_addr); 950EXPORT_SYMBOL(bfin_get_ether_addr);