diff options
Diffstat (limited to 'cmd/scsi.c')
| -rw-r--r-- | cmd/scsi.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/cmd/scsi.c b/cmd/scsi.c index 387ca1a262a..4213ec86775 100644 --- a/cmd/scsi.c +++ b/cmd/scsi.c @@ -17,7 +17,7 @@ static int scsi_curr_dev; /* current device */ /* * scsi boot command intepreter. Derived from diskboot */ -int do_scsiboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) +static int do_scsiboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) { return common_diskboot(cmdtp, "scsi", argc, argv); } @@ -25,8 +25,10 @@ int do_scsiboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) /* * scsi command intepreter */ -int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) +static int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) { + int ret; + switch (argc) { case 0: case 1: @@ -35,8 +37,10 @@ int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) if (strncmp(argv[1], "res", 3) == 0) { printf("\nReset SCSI\n"); scsi_bus_reset(); - scsi_scan(1); - return 0; + ret = scsi_scan(1); + if (ret) + return CMD_RET_FAILURE; + return ret; } if (strncmp(argv[1], "inf", 3) == 0) { blk_list_devices(IF_TYPE_SCSI); @@ -51,8 +55,10 @@ int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) return 0; } if (strncmp(argv[1], "scan", 4) == 0) { - scsi_scan(1); - return 0; + ret = scsi_scan(1); + if (ret) + return CMD_RET_FAILURE; + return ret; } if (strncmp(argv[1], "part", 4) == 0) { if (blk_list_part(IF_TYPE_SCSI)) |