X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fflash%2Fnand%2Fcore.c;fp=src%2Fflash%2Fnand%2Fcore.c;h=d9bb7dea9299fb910b329099a538c60053da6967;hb=7b94f4c99d7f7970c4f8bf51d477d88b93a4278c;hp=03deabd4b2496744c21b098be9c39fd2f5bd7f31;hpb=343204927656561dd3deec52c58c13ef2de4f60b;p=openocd.git

diff --git a/src/flash/nand/core.c b/src/flash/nand/core.c
index 03deabd4b2..d9bb7dea92 100644
--- a/src/flash/nand/core.c
+++ b/src/flash/nand/core.c
@@ -598,7 +598,8 @@ int nand_erase(struct nand_device *nand, int first_block, int last_block)
 			return ERROR_NAND_OPERATION_TIMEOUT;
 		}
 
-		if ((retval = nand_read_status(nand, &status)) != ERROR_OK)
+		retval = nand_read_status(nand, &status);
+		if (retval != ERROR_OK)
 		{
 			LOG_ERROR("couldn't read status");
 			return ERROR_NAND_OPERATION_FAILED;