diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-08-03 22:45:13 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-08-03 22:45:13 +0200 |
| commit | ac956293befb265b8958654d08c4ad52e605d46e (patch) | |
| tree | 4fbfc08b1be8616bc5ee2032b53996ac0c5d64d8 /common/cmd_ubi.c | |
| parent | e9aecdec153ae166739858e6a570432449b979f7 (diff) | |
| parent | 7385c28e9b5f7d47e6a8f1ad9800e6e70af714e2 (diff) | |
| download | u-boot-imx-ac956293befb265b8958654d08c4ad52e605d46e.zip u-boot-imx-ac956293befb265b8958654d08c4ad52e605d46e.tar.gz u-boot-imx-ac956293befb265b8958654d08c4ad52e605d46e.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/master
Diffstat (limited to 'common/cmd_ubi.c')
| -rw-r--r-- | common/cmd_ubi.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/common/cmd_ubi.c b/common/cmd_ubi.c index 2faf8d8..77ca0a5 100644 --- a/common/cmd_ubi.c +++ b/common/cmd_ubi.c @@ -442,10 +442,8 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) ulong addr = 0; int err = 0; - if (argc < 2) { - cmd_usage(cmdtp); - return 1; - } + if (argc < 2) + return cmd_usage(cmdtp); if (mtdparts_init() != 0) { printf("Error initializing mtdparts!\n"); @@ -471,10 +469,8 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) return 0; } - if (argc < 3) { - cmd_usage(cmdtp); - return 1; - } + if (argc < 3) + return cmd_usage(cmdtp); /* todo: get dev number for NAND... */ ubi_dev.nr = 0; |