[brcm63xx] images without tagid now fallback to the untouched partition layout (...

[openwrt.git] / target / linux / atheros / patches-2.6.30 / 120-spiflash.patch

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 74f01f6..e632060 100644 (file)
--- 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
 +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
 +
 +/*
 + * 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;
 +      spiflash_wait_complete(priv, 20);
 +
 +      instr->state = MTD_ERASE_DONE;

-+      if (instr->callback)
-+              instr->callback(instr);
++      mtd_erase_callback(instr);

 +
 +      return 0;
 +}
 +
 +      return 0;
 +}