aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-04-13 19:11:22 +0200
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-09-06 19:49:28 +0200
commit1a4c1d64bc8c7536cbfc84fd0f11037d09ecd2d3 (patch)
tree5a32ab139c65affb22f33fd3e91b29bbe6249317
parent481d0281d8ddcc0bbfbbce5d297f3a54c901b8ac (diff)
downloadupstream-1a4c1d64bc8c7536cbfc84fd0f11037d09ecd2d3.tar.gz
upstream-1a4c1d64bc8c7536cbfc84fd0f11037d09ecd2d3.tar.bz2
upstream-1a4c1d64bc8c7536cbfc84fd0f11037d09ecd2d3.zip
ath25: fix compilation for AR2315 MTD driver
Kernel commit e7bfb3fdbde3 ("mtd: Stop updating erase_info->state and calling mtd_erase_callback()") removed erase_info->state updates and calls of mtd_erase_callback(). Drop these erase callback invocations from AR2315 MTD driver as well. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
-rw-r--r--target/linux/ath25/patches-5.4/120-spiflash.patch5
1 files changed, 1 insertions, 4 deletions
diff --git a/target/linux/ath25/patches-5.4/120-spiflash.patch b/target/linux/ath25/patches-5.4/120-spiflash.patch
index d49669b976..52460f89dd 100644
--- a/target/linux/ath25/patches-5.4/120-spiflash.patch
+++ b/target/linux/ath25/patches-5.4/120-spiflash.patch
@@ -23,7 +23,7 @@
obj-$(CONFIG_MTD_POWERNV_FLASH) += powernv_flash.o
--- /dev/null
+++ b/drivers/mtd/devices/ar2315.c
-@@ -0,0 +1,459 @@
+@@ -0,0 +1,456 @@
+
+/*
+ * MTD driver for the SPI Flash Memory support on Atheros AR2315
@@ -284,9 +284,6 @@
+
+ mutex_unlock(&priv->lock);
+
-+ instr->state = MTD_ERASE_DONE;
-+ mtd_erase_callback(instr);
-+
+ return 0;
+}
+