From: Øyvind Harboe <oyvind.harboe@zylin.com>
Date: Mon, 14 Jun 2010 07:47:33 +0000 (+0200)
Subject: cfi: fix gaffe introduced in previous version
X-Git-Tag: v0.5.0-rc1~638
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=18918a0423e04180f580a4a9453e190488aab17d;p=openocd

cfi: fix gaffe introduced in previous version

flash probe broke w/in last commit.

ecc8041c0f4c30a7310c0f8414a5261ee7a090ca

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
---

diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index f911bb70..714cbe45 100644
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -2473,10 +2473,10 @@ static int cfi_probe(struct flash_bank *bank)
 			(1 << cfi_info->chip_erase_timeout_max) * (1 << cfi_info->chip_erase_timeout_typ));
 
 		uint8_t data;
-		retval = 1 << cfi_query_u8(bank, 0, 0x27, &data);
+		retval = cfi_query_u8(bank, 0, 0x27, &data);
 		if (retval != ERROR_OK)
 			return retval;
-		cfi_info->dev_size = data;
+		cfi_info->dev_size = 1 << data;
 
 		retval = cfi_query_u16(bank, 0, 0x28, &cfi_info->interface_desc);
 		if (retval != ERROR_OK)