Merge tag 'upstream-4.4-rc1' of git://git.infradead.org/linux-ubifs

[firefly-linux-kernel-4.4.55.git] / drivers / mtd / maps / lantiq-flash.c

diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c
index e2f878216048eed8ac69e973d5da7e9f4e668147..93852054977ea52a52bea1031296184d754e2761 100644 (file)
--- a/drivers/mtd/maps/lantiq-flash.c
+++ b/drivers/mtd/maps/lantiq-flash.c
@@ -160,7 +160,7 @@ ltq_mtd_probe(struct platform_device *pdev)
                return -ENXIO;
        }
 
-       ltq_mtd->mtd->owner = THIS_MODULE;
+       ltq_mtd->mtd->dev.parent = &pdev->dev;
 
        cfi = ltq_mtd->map->fldrv_priv;
        cfi->addr_unlock1 ^= 1;