X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnand.c;h=f55a81bb657b5ec1389dc5b0b96a5db5897a07f3;hp=3e63335fcf4da594a66efa2d2aa115d7b16aa15c;hb=ccc2e3fe760a425f831b9e1f0e143d7d01d73a25;hpb=83fc7fcf9b3ad4df227d4febae8e0b5f2778019c

diff --git a/src/flash/nand.c b/src/flash/nand.c
index 3e63335fcf..f55a81bb65 100644
--- a/src/flash/nand.c
+++ b/src/flash/nand.c
@@ -204,10 +204,10 @@ int handle_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, cha
 		if (strcmp(args[0], nand_flash_controllers[i]->name) == 0)
 		{
 			/* register flash specific commands */
-			if (nand_flash_controllers[i]->register_commands(cmd_ctx) != ERROR_OK)
+			if ((retval = nand_flash_controllers[i]->register_commands(cmd_ctx)) != ERROR_OK)
 			{
 				LOG_ERROR("couldn't register '%s' commands", args[0]);
-				exit(-1);
+				return retval;
 			}
 	
 			c = malloc(sizeof(nand_device_t));
@@ -355,7 +355,7 @@ int nand_read_status(struct nand_device_s *device, u8 *status)
 	/* Send read status command */
 	device->controller->command(device, NAND_CMD_STATUS);
 	
-	usleep(1000);
+	alive_sleep(1);
 	
 	/* read status */
 	if (device->device->options & NAND_BUSWIDTH_16)