cmd_i2c: bugfix: add missing brace
PATCH 1/1 cmd_i2c: bugfix: add missing brace
From: Alessandro Rubini <[email protected]>
The sub-command parser missed a brace, so "return 0;" is always taken and no error message is diplayed if you say "i2c scan" instead of "i2c probe", for example.
Proper brace is added. Also, a misleading and unneeded else is removed.
--- common/cmd_i2c.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
common/cmd_i2c.c +3 -3
@@ -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 ; }
Signature · 1 line
1.6.0.2
PATCH 1/1 cmd_i2c: bugfix: add missing brace
Hello Alessandro,
Quoted 29 lines · Alessandro Rubini
From: Alessandro Rubini <[email protected]>
The sub-command parser missed a brace, so "return 0;" is always taken and no error message is diplayed if you say "i2c scan" instead of "i2c probe", for example.
Proper brace is added. Also, a misleading and unneeded else is removed.
Signed-off-by Alessandro Rubini <[email protected]>--- common/cmd_i2c.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)common/cmd_i2c.c +2
-1@@ -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);
common/cmd_i2c.c int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) · line 1298
Quoted 10 lines
common/cmd_i2c.c +1
-2#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 ; }
Applied to u-boot-i2c.
Thanks!
bye
Heiko