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 /board/pn62 | |
| parent | e9aecdec153ae166739858e6a570432449b979f7 (diff) | |
| parent | 7385c28e9b5f7d47e6a8f1ad9800e6e70af714e2 (diff) | |
Merge branch 'master' of /home/wd/git/u-boot/master
Diffstat (limited to 'board/pn62')
| -rw-r--r-- | board/pn62/cmd_pn62.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/board/pn62/cmd_pn62.c b/board/pn62/cmd_pn62.c index 73294351ba..692160cea8 100644 --- a/board/pn62/cmd_pn62.c +++ b/board/pn62/cmd_pn62.c @@ -36,20 +36,20 @@ extern int do_bootm (cmd_tbl_t *, int, int, char *[]); /* * Command led: controls the various LEDs 0..11 on the PN62 card. */ -int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_led(cmd_tbl_t * cmdtp, int flag, int argc, char *const argv[]) { - unsigned int number, function; + unsigned int number, function; - if (argc != 3) { - cmd_usage(cmdtp); - return 1; - } - number = simple_strtoul(argv[1], NULL, 10); - if (number > PN62_LED_MAX) - return 1; - function = simple_strtoul(argv[2], NULL, 16); - set_led (number, function); - return 0; + if (argc != 3) + return cmd_usage(cmdtp); + + number = simple_strtoul(argv[1], NULL, 10); + if (number > PN62_LED_MAX) + return 1; + + function = simple_strtoul(argv[2], NULL, 16); + set_led(number, function); + return 0; } U_BOOT_CMD( led , 3, 1, do_led, @@ -83,8 +83,7 @@ int do_loadpci (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) addr = simple_strtoul(argv[1], NULL, 16); break; default: - cmd_usage(cmdtp); - return 1; + return cmd_usage(cmdtp); } printf ("## Ready for image download ...\n"); |