aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-09-21 09:58:30 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-09-21 09:58:30 +0000
commit239f30c87fb1a0bab3f5f7cf51cb94866607f673 (patch)
treefc038dbdd979091203affd3921da3c6114481575
parentb1f1f7c5a9cacb8def2966af90e209c92c4965db (diff)
downloadupstream-239f30c87fb1a0bab3f5f7cf51cb94866607f673.tar.gz
upstream-239f30c87fb1a0bab3f5f7cf51cb94866607f673.tar.bz2
upstream-239f30c87fb1a0bab3f5f7cf51cb94866607f673.zip
atheros: use the correct mtd erase callback in the spiflash driver
SVN-Revision: 17657
-rw-r--r--target/linux/atheros/patches-2.6.30/120-spiflash.patch5
1 files changed, 2 insertions, 3 deletions
diff --git a/target/linux/atheros/patches-2.6.30/120-spiflash.patch b/target/linux/atheros/patches-2.6.30/120-spiflash.patch
index 74f01f6525..e632060075 100644
--- a/target/linux/atheros/patches-2.6.30/120-spiflash.patch
+++ b/target/linux/atheros/patches-2.6.30/120-spiflash.patch
@@ -20,7 +20,7 @@
+obj-$(CONFIG_MTD_AR2315) += ar2315.o
--- /dev/null
+++ b/drivers/mtd/devices/ar2315.c
-@@ -0,0 +1,518 @@
+@@ -0,0 +1,517 @@
+
+/*
+ * MTD driver for the SPI Flash Memory support on Atheros AR2315
@@ -323,8 +323,7 @@
+ spiflash_wait_complete(priv, 20);
+
+ instr->state = MTD_ERASE_DONE;
-+ if (instr->callback)
-+ instr->callback(instr);
++ mtd_erase_callback(instr);
+
+ return 0;
+}