diff --git a/drivers/nor/cfi_flash.c b/drivers/nor/cfi_flash.c
index 4bdd2f6..830e9fc 100644
--- a/drivers/nor/cfi_flash.c
+++ b/drivers/nor/cfi_flash.c
@@ -316,6 +316,12 @@
 	/* Init: no FLASHes known */
 	info->flash_id = FLASH_UNKNOWN;
 	size += info->size = flash_get_size(info, dev->map_base);
+
+	if (dev->size > size) {
+		dev_dbg(dev, "limiting size from 0x%08x to 0x%08x\n", dev->size, size);
+		dev->size = size;
+	}
+
 	if (info->flash_id == FLASH_UNKNOWN) {
 		debug ("## Unknown FLASH on Bank at 0x%08x - Size = 0x%08lx = %ld MB\n",
 			dev->map_base, info->size, info->size << 20);