]> git.karo-electronics.de Git - karo-tx-uboot.git/commitdiff
i2c: Correct command return values
authorSimon Glass <sjg@chromium.org>
Tue, 29 Dec 2015 12:22:50 +0000 (05:22 -0700)
committerSimon Glass <sjg@chromium.org>
Thu, 21 Jan 2016 02:06:22 +0000 (19:06 -0700)
We should not return a -ve error code from command functions. Instead,
return CMD_RET_FAILURE. This avoids the "exit not allowed from main input
shell" error messages from the hush shell.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Heiko Schocher <hs@denx.de>
common/cmd_i2c.c

index 552c875f62ddba9a083d686fca9d84b44fbec26c..b3bb64408fe18af0c2a754ed653384bd55dee880 100644 (file)
@@ -1809,7 +1809,8 @@ static int do_i2c_bus_num(cmd_tbl_t *cmdtp, int flag, int argc,
                if (ret)
                        printf("Failure changing bus number (%d)\n", ret);
        }
-       return ret;
+
+       return ret ? CMD_RET_FAILURE : 0;
 }
 #endif  /* defined(CONFIG_SYS_I2C) */
 
@@ -1852,7 +1853,8 @@ static int do_i2c_bus_speed(cmd_tbl_t * cmdtp, int flag, int argc, char * const
                if (ret)
                        printf("Failure changing bus speed (%d)\n", ret);
        }
-       return ret;
+
+       return ret ? CMD_RET_FAILURE : 0;
 }
 
 /**