diff options
| author | Tom Rini <trini@ti.com> | 2014-01-20 07:51:22 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-01-20 07:51:22 -0500 |
| commit | 55ca99f8940e230366cadd522702fac9f962e904 (patch) | |
| tree | d767ca262f9d015df4b1c18aa80468a97fccdc5c /drivers/i2c/i2c_core.c | |
| parent | 4641c211f6e37454c30770521c4de79c725036b0 (diff) | |
| parent | dccacbe01968f9e682cb1dc9b7d43c831897cbec (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Diffstat (limited to 'drivers/i2c/i2c_core.c')
| -rw-r--r-- | drivers/i2c/i2c_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/i2c_core.c b/drivers/i2c/i2c_core.c index e1767f4bd4..18d6736601 100644 --- a/drivers/i2c/i2c_core.c +++ b/drivers/i2c/i2c_core.c @@ -349,7 +349,7 @@ unsigned int i2c_set_bus_speed(unsigned int speed) return 0; ret = I2C_ADAP->set_bus_speed(I2C_ADAP, speed); if (gd->flags & GD_FLG_RELOC) - I2C_ADAP->speed = ret; + I2C_ADAP->speed = (ret == 0) ? speed : 0; return ret; } |