diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-18 14:59:40 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-18 14:59:40 +0200 |
| commit | 462b1038738dd86f8dd70595f250ce792e90d244 (patch) | |
| tree | fbd3079c44bc2501f2a9461fb60cb1952d541aa9 | |
| parent | 52cb4d4fb3487313f5a72ea740f527a4aefaa365 (diff) | |
| parent | 0f1b3a2424c173c0dae2ebae12c131e4f3d59948 (diff) | |
| download | u-boot-imx-462b1038738dd86f8dd70595f250ce792e90d244.zip u-boot-imx-462b1038738dd86f8dd70595f250ce792e90d244.tar.gz u-boot-imx-462b1038738dd86f8dd70595f250ce792e90d244.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
| -rw-r--r-- | common/cmd_i2c.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c index ae26845..8f0fc9e 100644 --- a/common/cmd_i2c.c +++ b/common/cmd_i2c.c @@ -1282,17 +1282,17 @@ int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) return do_i2c_crc(cmdtp, flag, argc, argv); if (!strncmp(argv[0], "pr", 2)) return do_i2c_probe(cmdtp, flag, argc, argv); - if (!strncmp(argv[0], "re", 2)) + if (!strncmp(argv[0], "re", 2)) { i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); return 0; + } if (!strncmp(argv[0], "lo", 2)) return do_i2c_loop(cmdtp, flag, argc, argv); #if defined(CONFIG_CMD_SDRAM) if (!strncmp(argv[0], "sd", 2)) return do_sdram(cmdtp, flag, argc, argv); #endif - else - cmd_usage(cmdtp); + cmd_usage(cmdtp); return 0; } |