base-files: fix some failsafe issues

[openwrt/openwrt.git] / target / linux / mediatek / patches-4.4 / 0059-mtd-nand-backport-fixes.patch

diff --git a/target/linux/mediatek/patches-4.4/0059-mtd-nand-backport-fixes.patch b/target/linux/mediatek/patches-4.4/0059-mtd-nand-backport-fixes.patch
index 392dea3eccc5b8419b8b60caf35f747a1094b8f2..be428fd9c1d20b26c6fd396451a04df9d8af27c2 100644 (file)
--- a/target/linux/mediatek/patches-4.4/0059-mtd-nand-backport-fixes.patch
+++ b/target/linux/mediatek/patches-4.4/0059-mtd-nand-backport-fixes.patch
@@ -1,17 +1,15 @@
-From 96ec6b2ee8a19799835209d0a6753519b96277f8 Mon Sep 17 00:00:00 2001
+From 96bddff914c0cee1b16d809220e84b470b433122 Mon Sep 17 00:00:00 2001
 From: John Crispin <blogic@openwrt.org>
 Date: Thu, 31 Mar 2016 02:28:08 +0200
-Subject: [PATCH 59/78] mtd: nand: backport fixes
+Subject: [PATCH 59/91] mtd: nand: backport fixes
 
 ---
  drivers/mtd/nand/mtksdg1_nand.c |    9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/mtd/nand/mtksdg1_nand.c b/drivers/mtd/nand/mtksdg1_nand.c
-index 55dd17d..f92b949 100644
 --- a/drivers/mtd/nand/mtksdg1_nand.c
 +++ b/drivers/mtd/nand/mtksdg1_nand.c
-@@ -107,6 +107,9 @@ static struct nand_ecclayout nand_4k_128 = {
+@@ -107,6 +107,9 @@ static struct nand_ecclayout nand_4k_128
        .oobfree = { {0, 32} },
  };
  
@@ -21,7 +19,7 @@ index 55dd17d..f92b949 100644
  /* NFI register access */
  static inline void mtk_nfi_writel(struct mtk_nfc_host *host, u32 val, u32 reg)
  {
-@@ -1298,6 +1301,7 @@ static int mtk_nfc_probe(struct platform_device *pdev)
+@@ -1298,6 +1301,7 @@ static int mtk_nfc_probe(struct platform
  
        chip = &host->chip;
        mtd = nand_to_mtd(chip);
@@ -29,7 +27,7 @@ index 55dd17d..f92b949 100644
        host->dev = dev;
  
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-@@ -1428,7 +1432,10 @@ static int mtk_nfc_probe(struct platform_device *pdev)
+@@ -1428,7 +1432,10 @@ static int mtk_nfc_probe(struct platform
        }
        host->switch_oob = false;
  
@@ -41,6 +39,3 @@ index 55dd17d..f92b949 100644
        if (ret) {
                dev_err(dev, "mtd parse partition error\n");
                goto nand_free;
--- 
-1.7.10.4
-