aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-3.10
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-04-06 00:09:50 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-04-06 00:09:50 +0000
commit08dc8d04778a4f5e3ef7f6171c3dd7c6ce0c98e1 (patch)
tree3cfdfbc15d68b88ade445fe856bef117f55b5caa /target/linux/ramips/patches-3.10
parentf61df7b4308cf938470f243d6f43fc6792983aef (diff)
downloadupstream-08dc8d04778a4f5e3ef7f6171c3dd7c6ce0c98e1.tar.gz
upstream-08dc8d04778a4f5e3ef7f6171c3dd7c6ce0c98e1.tar.bz2
upstream-08dc8d04778a4f5e3ef7f6171c3dd7c6ce0c98e1.zip
ramips: fix regression from r39949 (#15382)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40391 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips/patches-3.10')
-rw-r--r--target/linux/ramips/patches-3.10/0213-MTD-add-mt7621-nand-support.patch24
1 files changed, 1 insertions, 23 deletions
diff --git a/target/linux/ramips/patches-3.10/0213-MTD-add-mt7621-nand-support.patch b/target/linux/ramips/patches-3.10/0213-MTD-add-mt7621-nand-support.patch
index 6e8aec9fc6..93ce9e1d33 100644
--- a/target/linux/ramips/patches-3.10/0213-MTD-add-mt7621-nand-support.patch
+++ b/target/linux/ramips/patches-3.10/0213-MTD-add-mt7621-nand-support.patch
@@ -4089,32 +4089,10 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
struct nand_chip *chip = mtd->priv;
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
-@@ -1378,6 +1378,47 @@ int nand_isbad_bbt(struct mtd_info *mtd,
+@@ -1378,6 +1378,25 @@ int nand_isbad_bbt(struct mtd_info *mtd,
return 1;
}
-+/**
-+ * nand_markbad_bbt - [NAND Interface] Mark a block bad in the BBT
-+ * @mtd: MTD device structure
-+ * @offs: offset of the bad block
-+ */
-+int nand_markbad_bbt(struct mtd_info *mtd, loff_t offs)
-+{
-+ struct nand_chip *this = mtd->priv;
-+ int block, ret = 0;
-+
-+ block = (int)(offs >> this->bbt_erase_shift);
-+
-+ /* Mark bad block in memory */
-+ bbt_mark_entry(this, block, BBT_BLOCK_WORN);
-+
-+ /* Update flash-based bad block table */
-+ if (this->bbt_options & NAND_BBT_USE_FLASH)
-+ ret = nand_update_bbt(mtd, offs);
-+
-+ return ret;
-+}
-+
+void nand_bbt_set(struct mtd_info *mtd, int page, int flag)
+{
+ struct nand_chip *this = mtd->priv;