From 22911a3aedfa01c7a5643de9c21fbb94f6219c38 Mon Sep 17 00:00:00 2001 From: Øyvind Harboe Date: Mon, 20 Sep 2010 09:22:46 +0200 Subject: flash: fix error handling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit sensible error must be reported at failure site Signed-off-by: Øyvind Harboe --- src/flash/nor/tcl.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'src/flash/nor') diff --git a/src/flash/nor/tcl.c b/src/flash/nor/tcl.c index 3dc6cff3..8604b4b3 100644 --- a/src/flash/nor/tcl.c +++ b/src/flash/nor/tcl.c @@ -132,23 +132,14 @@ COMMAND_HANDLER(handle_flash_probe_command) { command_print(CMD_CTX, "flash '%s' found at 0x%8.8" PRIx32, p->driver->name, p->base); } - else if (retval == ERROR_FLASH_BANK_INVALID) - { - command_print(CMD_CTX, "probing failed for flash bank '#%s' at 0x%8.8" PRIx32, - CMD_ARGV[0], p->base); - } - else - { - command_print(CMD_CTX, "unknown error when probing flash bank '#%s' at 0x%8.8" PRIx32, - CMD_ARGV[0], p->base); - } } else { command_print(CMD_CTX, "flash bank '#%s' is out of bounds", CMD_ARGV[0]); + retval = ERROR_FAIL; } - return ERROR_OK; + return retval; } COMMAND_HANDLER(handle_flash_erase_check_command) -- cgit v1.2.3