From bd542afd3bebe36beb19f98d11259d06e2e673b4 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Fri, 22 Jun 2012 13:36:18 +0100 Subject: [PATCH] --- yaml --- r: 319720 b: refs/heads/master c: 56dbd61f297d8d645856f604536bcd856ab9060a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mfd/palmas.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fb28e9d4e283..185f6df6ad5b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dca1a71e4108a0a9051a653d885297e9d1cc656c +refs/heads/master: 56dbd61f297d8d645856f604536bcd856ab9060a diff --git a/trunk/drivers/mfd/palmas.c b/trunk/drivers/mfd/palmas.c index 5d896b352284..98fdcdbbd610 100644 --- a/trunk/drivers/mfd/palmas.c +++ b/trunk/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));