summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-07-18 14:59:05 +0200
committerWolfgang Denk <wd@denx.de>2009-07-18 14:59:05 +0200
commit0f1b3a2424c173c0dae2ebae12c131e4f3d59948 (patch)
treef2e60eb2c630d60f5d025ce864ef0d953d126c7d
parentf732a7598fa36d48241df20b1a1f4cdbf09f75ee (diff)
parent6aee3048348f1b19ab89156da98bfa4f7babf24b (diff)
downloadu-boot-imx-0f1b3a2424c173c0dae2ebae12c131e4f3d59948.zip
u-boot-imx-0f1b3a2424c173c0dae2ebae12c131e4f3d59948.tar.gz
u-boot-imx-0f1b3a2424c173c0dae2ebae12c131e4f3d59948.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-i2c
-rw-r--r--common/cmd_i2c.c6
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;
}