diff options
| author | Alexey Brodkin <Alexey.Brodkin@synopsys.com> | 2013-12-11 18:04:40 +0400 |
|---|---|---|
| committer | Heiko Schocher <hs@denx.de> | 2014-01-13 08:17:27 +0100 |
| commit | 6d001e7df9e4b33b9be9bc4117091365b2ff1607 (patch) | |
| tree | ea24d9bdd20ba085f8d3da1d1d6a44f404c5973f /common | |
| parent | da1ed0d20e992296aaafb75e545890bce933d340 (diff) | |
| download | blackbird-obmc-uboot-6d001e7df9e4b33b9be9bc4117091365b2ff1607.tar.gz blackbird-obmc-uboot-6d001e7df9e4b33b9be9bc4117091365b2ff1607.zip | |
env_eeprom - fix bus recovery for "eeprom_bus_read"
"env_eeprom_bus" is no longer in use (it was introduced in commit
548738b4d43af841ff58c787bce297ac6a8bf7d1 "cmd_eeprom: I2C updates").
As in "eeprom_bus_write" we just reset I2C bus with the one we saved in
"old_bus".
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Tom Rini <trini@ti.com>
Cc: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'common')
| -rw-r--r-- | common/env_eeprom.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/common/env_eeprom.c b/common/env_eeprom.c index 0dcdd1fc80..0db2bb63fe 100644 --- a/common/env_eeprom.c +++ b/common/env_eeprom.c @@ -24,7 +24,6 @@ DECLARE_GLOBAL_DATA_PTR; env_t *env_ptr; char *env_name_spec = "EEPROM"; -int env_eeprom_bus = -1; static int eeprom_bus_read(unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt) @@ -40,8 +39,7 @@ static int eeprom_bus_read(unsigned dev_addr, unsigned offset, rcode = eeprom_read(dev_addr, offset, buffer, cnt); #if defined(CONFIG_I2C_ENV_EEPROM_BUS) - if (old_bus != env_eeprom_bus) - i2c_set_bus_num(old_bus); + i2c_set_bus_num(old_bus); #endif return rcode; @@ -63,6 +61,7 @@ static int eeprom_bus_write(unsigned dev_addr, unsigned offset, #if defined(CONFIG_I2C_ENV_EEPROM_BUS) i2c_set_bus_num(old_bus); #endif + return rcode; } |
