summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorNikita Kiryanov <nikita@compulab.co.il>2015-09-06 11:48:36 +0300
committerStefano Babic <sbabic@denx.de>2015-09-13 10:35:43 +0200
commite93e809f2f71bc6705818f1978b2d15bddfcae72 (patch)
treeeb83ee18be28f3618baa5a43b046e66debb6fd8e /board
parent72898ac7b80b42060b30d17cf185ea7a01194840 (diff)
compulab: eeprom: propagate error value in read_mac_addr()
cl_eeprom_read_mac_addr() doesn't differentiate between success case and inability to access eeprom. Fix this by propagating the return value of cl_eeprom_setup(). Cc: Stefano Babic <sbabic@denx.de> Cc: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Diffstat (limited to 'board')
-rw-r--r--board/compulab/common/eeprom.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c
index aaacd2e32e..9f18a3d949 100644
--- a/board/compulab/common/eeprom.c
+++ b/board/compulab/common/eeprom.c
@@ -105,9 +105,11 @@ void get_board_serial(struct tag_serialnr *serialnr)
int cl_eeprom_read_mac_addr(uchar *buf, uint eeprom_bus)
{
uint offset;
+ int err;
- if (cl_eeprom_setup(eeprom_bus))
- return 0;
+ err = cl_eeprom_setup(eeprom_bus);
+ if (err)
+ return err;
offset = (cl_eeprom_layout != LAYOUT_LEGACY) ?
MAC_ADDR_OFFSET : MAC_ADDR_OFFSET_LEGACY;