Skip to content

Commit

Permalink
mfd: Fix palmas regulator pdata missing
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Graeme Gregory authored and Samuel Ortiz committed Jul 8, 2012
1 parent c05995c commit adc20e0
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/mfd/palmas.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down

0 comments on commit adc20e0

Please sign in to comment.