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 /drivers/misc/ds4510.c | |
| parent | e9aecdec153ae166739858e6a570432449b979f7 (diff) | |
| parent | 7385c28e9b5f7d47e6a8f1ad9800e6e70af714e2 (diff) | |
Merge branch 'master' of /home/wd/git/u-boot/master
Diffstat (limited to 'drivers/misc/ds4510.c')
| -rw-r--r-- | drivers/misc/ds4510.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c index 5b33c1f..aa893c3 100644 --- a/drivers/misc/ds4510.c +++ b/drivers/misc/ds4510.c @@ -294,8 +294,7 @@ int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (!c || !((argc == (c->maxargs)) || (((int)c->cmd == DS4510_CMD_DEVICE) && (argc == (c->maxargs - 1))))) { - cmd_usage(cmdtp); - return 1; + return cmd_usage(cmdtp); } /* arg2 used as chip addr and pin number */ @@ -366,14 +365,12 @@ int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #ifdef CONFIG_CMD_DS4510_MEM /* Only eeprom, seeprom, and sram commands should make it here */ - if (strcmp(argv[2], "read") == 0) { + if (strcmp(argv[2], "read") == 0) rw_func = ds4510_mem_read; - } else if (strcmp(argv[2], "write") == 0) { + else if (strcmp(argv[2], "write") == 0) rw_func = ds4510_mem_write; - } else { - cmd_usage(cmdtp); - return 1; - } + else + return cmd_usage(cmdtp); addr = simple_strtoul(argv[3], NULL, 16); off += simple_strtoul(argv[4], NULL, 16); |