These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / mtd / nand / docg4.c

diff --git a/kernel/drivers/mtd/nand/docg4.c b/kernel/drivers/mtd/nand/docg4.c
index e5d7bca..408cf69 100644 (file)
--- a/kernel/drivers/mtd/nand/docg4.c
+++ b/kernel/drivers/mtd/nand/docg4.c
@@ -977,13 +977,13 @@ static int write_page(struct mtd_info *mtd, struct nand_chip *nand,
 }
 
 static int docg4_write_page_raw(struct mtd_info *mtd, struct nand_chip *nand,
-                                const uint8_t *buf, int oob_required)
+                               const uint8_t *buf, int oob_required, int page)
 {
        return write_page(mtd, nand, buf, false);
 }
 
 static int docg4_write_page(struct mtd_info *mtd, struct nand_chip *nand,
-                            const uint8_t *buf, int oob_required)
+                            const uint8_t *buf, int oob_required, int page)
 {
        return write_page(mtd, nand, buf, true);
 }
@@ -1113,7 +1113,7 @@ static int docg4_block_markbad(struct mtd_info *mtd, loff_t ofs)
 
        /* write first page of block */
        write_page_prologue(mtd, g4_addr);
-       docg4_write_page(mtd, nand, buf, 1);
+       docg4_write_page(mtd, nand, buf, 1, page);
        ret = pageprog(mtd);
 
        kfree(buf);
@@ -1316,7 +1316,7 @@ static int __init probe_docg4(struct platform_device *pdev)
        doc = (struct docg4_priv *) (nand + 1);
        mtd->priv = nand;
        nand->priv = doc;
-       mtd->owner = THIS_MODULE;
+       mtd->dev.parent = &pdev->dev;
        doc->virtadr = virtadr;
        doc->dev = dev;