From: Jim Paris <jim@jtan.com>
Date: Wed, 29 Oct 2014 23:09:49 +0000 (-0400)
Subject: nrf51: fix checks for is_erased
X-Git-Tag: v0.9.0-rc1~235
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a59e8058e77038f9212dcea61ca8572f1adf390b;p=openocd

nrf51: fix checks for is_erased

is_erased can take the value 0 (no), 1 (yes), or -1 (unknown).
Checks like (!is_erased) don't do the right thing if it's -1.

Change-Id: I10ba32c99494ca803e0a7a1ba56fdd78184b96bb
Signed-off-by: Jim Paris <jim@jtan.com>
Reviewed-on: http://openocd.zylin.com/2366
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
---

diff --git a/src/flash/nor/nrf51.c b/src/flash/nor/nrf51.c
index bfa199a2..c5ffa832 100644
--- a/src/flash/nor/nrf51.c
+++ b/src/flash/nor/nrf51.c
@@ -642,7 +642,7 @@ static int nrf51_write_page(struct flash_bank *bank, uint32_t offset, const uint
 	if (sector->is_protected)
 		goto error;
 
-	if (!sector->is_erased) {
+	if (sector->is_erased != 1) {
 		res = nrf51_erase_page(bank, chip, sector);
 		if (res != ERROR_OK) {
 			LOG_ERROR("Failed to erase sector @ 0x%08"PRIx32, sector->offset);
@@ -784,7 +784,7 @@ static int nrf51_uicr_flash_write(struct flash_bank *bank,
 	if (res != ERROR_OK)
 		return res;
 
-	if (!sector->is_erased) {
+	if (sector->is_erased != 1) {
 		res = nrf51_erase_page(bank, chip, sector);
 		if (res != ERROR_OK)
 			return res;