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

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

diff --git a/kernel/drivers/mtd/nand/bf5xx_nand.c b/kernel/drivers/mtd/nand/bf5xx_nand.c
index 4d8d4ba..61bd216 100644 (file)
--- a/kernel/drivers/mtd/nand/bf5xx_nand.c
+++ b/kernel/drivers/mtd/nand/bf5xx_nand.c
@@ -566,7 +566,8 @@ static int bf5xx_nand_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip
 }
 
 static int bf5xx_nand_write_page_raw(struct mtd_info *mtd,
-               struct nand_chip *chip, const uint8_t *buf, int oob_required)
+               struct nand_chip *chip, const uint8_t *buf, int oob_required,
+               int page)
 {
        bf5xx_nand_write_buf(mtd, buf, mtd->writesize);
        bf5xx_nand_write_buf(mtd, chip->oob_poi, mtd->oobsize);
@@ -782,7 +783,7 @@ static int bf5xx_nand_probe(struct platform_device *pdev)
        /* initialise mtd info data struct */
        mtd             = &info->mtd;
        mtd->priv       = chip;
-       mtd->owner      = THIS_MODULE;
+       mtd->dev.parent = &pdev->dev;
 
        /* initialise the hardware */
        err = bf5xx_nand_hw_init(info);