Merge tag 'stable/for-linus-3.12-rc2-tag' of git://git.kernel.org/pub/scm/linux/kerne...

[deliverable/linux.git] / drivers / mfd / mfd-core.c

diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index 7604f4e5df40a10e03693407da38cb82ea3de14b..f421586f29fb09b02644ee8b05aa6777fb353835 100644 (file)
--- a/drivers/mfd/mfd-core.c
+++ b/drivers/mfd/mfd-core.c
@@ -96,6 +96,8 @@ static int mfd_add_device(struct device *parent, int id,
 
        pdev->dev.parent = parent;
        pdev->dev.type = &mfd_dev_type;
+       pdev->dev.dma_mask = parent->dma_mask;
+       pdev->dev.dma_parms = parent->dma_parms;
 
        if (parent->of_node && cell->of_compatible) {
                for_each_child_of_node(parent->of_node, np) {