diff options
Diffstat (limited to 'common/cmd_scsi.c')
| -rw-r--r-- | common/cmd_scsi.c | 15 | 
1 files changed, 8 insertions, 7 deletions
| diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c index fa10751b7..d15b567db 100644 --- a/common/cmd_scsi.c +++ b/common/cmd_scsi.c @@ -230,7 +230,7 @@ int do_scsiboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])  		boot_device = argv[2];  		break;  	default: -		return cmd_usage(cmdtp); +		return CMD_RET_USAGE;  	}  	if (!boot_device) { @@ -336,10 +336,11 @@ int do_scsiboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])  int do_scsi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])  {  	switch (argc) { -    case 0: -    case 1:	return cmd_usage(cmdtp); +	case 0: +	case 1: +		return CMD_RET_USAGE; -    case 2: +	case 2:  			if (strncmp(argv[1],"res",3) == 0) {  				printf("\nReset SCSI\n");  				scsi_bus_reset(); @@ -384,7 +385,7 @@ int do_scsi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])  					printf("\nno SCSI devices available\n");  				return 1;  			} -			return cmd_usage(cmdtp); +			return CMD_RET_USAGE;  	case 3:  			if (strncmp(argv[1],"dev",3) == 0) {  				int dev = (int)simple_strtoul(argv[2], NULL, 10); @@ -412,7 +413,7 @@ int do_scsi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])  				}  				return 1;  			} -			return cmd_usage(cmdtp); +			return CMD_RET_USAGE;      default:  			/* at least 4 args */  			if (strcmp(argv[1],"read") == 0) { @@ -427,7 +428,7 @@ int do_scsi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])  				return 0;  			}  	} /* switch */ -	return cmd_usage(cmdtp); +	return CMD_RET_USAGE;  }  /**************************************************************************************** |