--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
-@@ -3096,6 +3096,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -3098,6 +3098,7 @@ int spi_nor_scan(struct spi_nor *nor, co
struct device *dev = nor->dev;
struct mtd_info *mtd = &nor->mtd;
struct device_node *np = spi_nor_get_flash_node(nor);
int ret;
int i;
-@@ -3150,7 +3151,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -3152,7 +3153,12 @@ int spi_nor_scan(struct spi_nor *nor, co
if (ret)
return ret;