env_eeprom - fix bus recovery for "eeprom_bus_read"
PATCH 1/1 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 <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Tom Rini <[email protected]>
Cc Heiko Schocher <[email protected]>
--- common/env_eeprom.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
common/env_eeprom.c +2 -3
@@ -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; }
Signature · 1 line
1.8.4.2