aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mfd/arizona-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 5ac3aa48473b..a2f5beff99d7 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -607,11 +607,11 @@ int arizona_dev_init(struct arizona *arizona)
607 dev_set_drvdata(arizona->dev, arizona); 607 dev_set_drvdata(arizona->dev, arizona);
608 mutex_init(&arizona->clk_lock); 608 mutex_init(&arizona->clk_lock);
609 609
610 arizona_of_get_core_pdata(arizona);
611
612 if (dev_get_platdata(arizona->dev)) 610 if (dev_get_platdata(arizona->dev))
613 memcpy(&arizona->pdata, dev_get_platdata(arizona->dev), 611 memcpy(&arizona->pdata, dev_get_platdata(arizona->dev),
614 sizeof(arizona->pdata)); 612 sizeof(arizona->pdata));
613 else
614 arizona_of_get_core_pdata(arizona);
615 615
616 regcache_cache_only(arizona->regmap, true); 616 regcache_cache_only(arizona->regmap, true);
617 617