diff options
author | Graeme Gregory <gg@slimlogic.co.uk> | 2012-06-22 08:36:18 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-07-08 18:16:25 -0400 |
commit | adc20e02aefa83d95829cdeb1152ff641adcc779 (patch) | |
tree | 1ae9a0864783bd7b4393e11e5b0ec1e6c0a47aa4 /drivers/mfd/palmas.c | |
parent | c05995c3d7d0d8edda6ecd2855ac5fad15fa4723 (diff) |
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/mfd/palmas.c')
-rw-r--r-- | drivers/mfd/palmas.c | 3 |
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, | |||
441 | goto err; | 441 | goto err; |
442 | } | 442 | } |
443 | 443 | ||
444 | children[PALMAS_PMIC_ID].platform_data = pdata->pmic_pdata; | ||
445 | children[PALMAS_PMIC_ID].pdata_size = sizeof(*pdata->pmic_pdata); | ||
446 | |||
444 | ret = mfd_add_devices(palmas->dev, -1, | 447 | ret = mfd_add_devices(palmas->dev, -1, |
445 | children, ARRAY_SIZE(palmas_children), | 448 | children, ARRAY_SIZE(palmas_children), |
446 | NULL, regmap_irq_chip_get_base(palmas->irq_data)); | 449 | NULL, regmap_irq_chip_get_base(palmas->irq_data)); |