mutex_unlock(&flash->lock);
return 0;
-@@ -1017,6 +1040,12 @@ static int m25p_probe(struct spi_device
+@@ -1020,6 +1043,12 @@ static int m25p_probe(struct spi_device
flash->mtd._unlock = m25p80_unlock;
}
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -1117,7 +1117,9 @@ static int m25p_probe(struct spi_device
+@@ -1120,7 +1120,9 @@ static int m25p_probe(struct spi_device
/* partitions should match sector boundaries; and it may be good to
* use readonly partitions for writeprotected sectors (BP2..BP0).
*/
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -1067,6 +1067,7 @@ static int m25p_probe(struct spi_device
+@@ -1070,6 +1070,7 @@ static int m25p_probe(struct spi_device
if (info->flags & M25P_NO_ERASE)
flash->mtd.flags |= MTD_NO_ERASE;