kernel: bump 4.14 to 4.14.145

[openwrt/openwrt.git] / target / linux / mediatek / patches-4.14 / 0162-mtd-nand-mtk-use-nand_reset-to-reset-NAND-devices-in.patch

diff --git a/target/linux/mediatek/patches-4.14/0162-mtd-nand-mtk-use-nand_reset-to-reset-NAND-devices-in.patch b/target/linux/mediatek/patches-4.14/0162-mtd-nand-mtk-use-nand_reset-to-reset-NAND-devices-in.patch
index d27209292a170e9f6b6debfcefae5ca3f2b849f3..44299347652bd0cdc967606d9cf9599a32b9978c 100644 (file)
--- a/target/linux/mediatek/patches-4.14/0162-mtd-nand-mtk-use-nand_reset-to-reset-NAND-devices-in.patch
+++ b/target/linux/mediatek/patches-4.14/0162-mtd-nand-mtk-use-nand_reset-to-reset-NAND-devices-in.patch
@@ -17,7 +17,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
 
 --- a/drivers/mtd/nand/mtk_nand.c
 +++ b/drivers/mtd/nand/mtk_nand.c
-@@ -1540,7 +1540,6 @@ static int mtk_nfc_resume(struct device
+@@ -1539,7 +1539,6 @@ static int mtk_nfc_resume(struct device
        struct mtk_nfc *nfc = dev_get_drvdata(dev);
        struct mtk_nfc_nand_chip *chip;
        struct nand_chip *nand;
@@ -25,7 +25,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
        int ret;
        u32 i;
  
-@@ -1553,11 +1552,8 @@ static int mtk_nfc_resume(struct device
+@@ -1552,11 +1551,8 @@ static int mtk_nfc_resume(struct device
        /* reset NAND chip if VCC was powered off */
        list_for_each_entry(chip, &nfc->chips, node) {
                nand = &chip->nand;