--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1534,6 +1534,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1541,6 +1541,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;
-@@ -1598,7 +1599,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1606,7 +1607,12 @@ int spi_nor_scan(struct spi_nor *nor, co
spi_nor_wait_till_ready(nor);
}