Commit 9166f4af authored by Takahiro Kuwano's avatar Takahiro Kuwano Committed by Tudor Ambarus
Browse files

mtd: spi-nor: sfdp: Fix last erase region marking 



The place of spi_nor_region_mark_end() must be moved, because 'i' is
re-used for the index of erase[].

Fixes: b038e8e3 ("mtd: spi-nor: parse SFDP Sector Map Parameter Table")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarTakahiro Kuwano <Takahiro.Kuwano@infineon.com>
[ta: Add Fixes tag and Cc to stable]
Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Link: https://lore.kernel.org/r/02ce8d84b7989ebee33382f6494df53778dd508e.1601612872.git.Takahiro.Kuwano@infineon.com
parent abdf5a5e

drivers/mtd/spi-nor/sfdp.c

+1 −2
Original line number Diff line number Diff line
@@ -858,6 +858,7 @@ spi_nor_init_non_uniform_erase_map(struct spi_nor *nor, 
		offset = (region[i].offset & ~SNOR_ERASE_FLAGS_MASK) +

			 region[i].size;

	}

	spi_nor_region_mark_end(&region[i - 1]);



	save_uniform_erase_type = map->uniform_erase_type;

	map->uniform_erase_type = spi_nor_sort_erase_mask(map,
@@ -881,8 +882,6 @@ spi_nor_init_non_uniform_erase_map(struct spi_nor *nor, 
		if (!(regions_erase_type & BIT(erase[i].idx)))

			spi_nor_set_erase_type(&erase[i], 0, 0xFF);



	spi_nor_region_mark_end(&region[i - 1]);



	return 0;

}