X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnor%2Ftcl.c;h=4ba5f47ca3d58236cf033404454cc47b2bfe6d06;hp=142f31f71f06264302cd49c329f56586ddf1b18e;hb=4668bd264cfe64c3e3ddd0f75cb5bf2e5e85f717;hpb=3931b99d142d337ea6558fd09aad2e0812c04507

diff --git a/src/flash/nor/tcl.c b/src/flash/nor/tcl.c
index 142f31f71f..4ba5f47ca3 100644
--- a/src/flash/nor/tcl.c
+++ b/src/flash/nor/tcl.c
@@ -106,10 +106,10 @@ COMMAND_HANDLER(handle_flash_info_command)
 		retval = p->driver->info(p, buf, sizeof(buf));
 		command_print(CMD_CTX, "%s", buf);
 		if (retval != ERROR_OK)
-			LOG_ERROR("error retrieving flash info (%d)", retval);
+			LOG_ERROR("error retrieving flash info");
 	}
 
-	return ERROR_OK;
+	return retval;
 }
 
 COMMAND_HANDLER(handle_flash_probe_command)
@@ -185,7 +185,7 @@ COMMAND_HANDLER(handle_flash_erase_check_command)
 			      erase_state);
 	}
 
-	return ERROR_OK;
+	return retval;
 }
 
 COMMAND_HANDLER(handle_flash_erase_address_command)
@@ -355,7 +355,7 @@ COMMAND_HANDLER(handle_flash_protect_command)
 			(int) last, p->bank_number);
 	}
 
-	return ERROR_OK;
+	return retval;
 }
 
 COMMAND_HANDLER(handle_flash_write_image_command)
@@ -848,14 +848,14 @@ COMMAND_HANDLER(handle_flash_bank_command)
 COMMAND_HANDLER(handle_flash_banks_command)
 {
 	if (CMD_ARGC != 0)
-		return ERROR_INVALID_ARGUMENTS;
+		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	unsigned n = 0;
 	for (struct flash_bank *p = flash_bank_list(); p; p = p->next, n++)
 	{
-		LOG_USER("#%" PRIu32 " : %s at 0x%8.8" PRIx32 ", size 0x%8.8" PRIx32 ", "
+		LOG_USER("#%" PRIu32 " : %s (%s) at 0x%8.8" PRIx32 ", size 0x%8.8" PRIx32 ", "
 			"buswidth %u, chipwidth %u", p->bank_number,
-			p->driver->name, p->base, p->size,
+			p->name, p->driver->name, p->base, p->size,
 			p->bus_width, p->chip_width);
 	}
 	return ERROR_OK;