summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGraeme Gregory <gg@slimlogic.co.uk>2012-06-22 13:36:18 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2012-07-09 00:16:25 +0200
commitadc20e02aefa83d95829cdeb1152ff641adcc779 (patch)
tree1ae9a0864783bd7b4393e11e5b0ec1e6c0a47aa4 /drivers
parentc05995c3d7d0d8edda6ecd2855ac5fad15fa4723 (diff)
downloadlinux-adc20e02aefa83d95829cdeb1152ff641adcc779.tar.bz2
mfd: Fix palmas regulator pdata missing
Due to a merge error the section of code passing the pdata for the regulator driver to the mfd_add_devices via the children structure was missing. This corrects this problem. Signed-off-by: Graeme Gregory <gg@slimlogic.co.uk> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/palmas.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c
index 5d896b352284..98fdcdbbd610 100644
--- a/drivers/mfd/palmas.c
+++ b/drivers/mfd/palmas.c
@@ -441,6 +441,9 @@ static int __devinit palmas_i2c_probe(struct i2c_client *i2c,
goto err;
}
+ children[PALMAS_PMIC_ID].platform_data = pdata->pmic_pdata;
+ children[PALMAS_PMIC_ID].pdata_size = sizeof(*pdata->pmic_pdata);
+
ret = mfd_add_devices(palmas->dev, -1,
children, ARRAY_SIZE(palmas_children),
NULL, regmap_irq_chip_get_base(palmas->irq_data));