diff options
| author | Tom Rini <trini@ti.com> | 2014-12-08 16:35:05 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-12-08 16:35:05 -0500 |
| commit | 8bd60ccf532f0fec07609528c2b04a0725d83984 (patch) | |
| tree | c28951389efe41696aeb8f8c62039cdef0ae14e9 /drivers | |
| parent | 0fffbd26d55d89ec5241f8e1ce4c5bc77892678b (diff) | |
| parent | f4ed36964a7ab4e729d62e96dac15a674dcc2668 (diff) | |
| download | talos-obmc-uboot-8bd60ccf532f0fec07609528c2b04a0725d83984.tar.gz talos-obmc-uboot-8bd60ccf532f0fec07609528c2b04a0725d83984.zip | |
Merge git://git.denx.de/u-boot-i2c
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/i2c_core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/i2c/i2c_core.c b/drivers/i2c/i2c_core.c index d34b749a56..41cc3b8fa4 100644 --- a/drivers/i2c/i2c_core.c +++ b/drivers/i2c/i2c_core.c @@ -174,11 +174,11 @@ static int i2c_mux_set_all(void) return 0; } -static int i2c_mux_disconnet_all(void) +static int i2c_mux_disconnect_all(void) { struct i2c_bus_hose *i2c_bus_tmp = &i2c_bus[I2C_BUS]; int i; - uint8_t buf; + uint8_t buf = 0; if (I2C_ADAP->init_done == 0) return 0; @@ -197,7 +197,7 @@ static int i2c_mux_disconnet_all(void) ret = I2C_ADAP->write(I2C_ADAP, chip, 0, 0, &buf, 1); if (ret != 0) { - printf("i2c: mux diconnect error\n"); + printf("i2c: mux disconnect error\n"); return ret; } } while (i > 0); @@ -293,7 +293,7 @@ int i2c_set_bus_num(unsigned int bus) } #ifndef CONFIG_SYS_I2C_DIRECT_BUS - i2c_mux_disconnet_all(); + i2c_mux_disconnect_all(); #endif gd->cur_i2c_bus = bus; |
