summaryrefslogtreecommitdiff
path: root/drivers/mfd/88pm805.c
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2013-08-21 12:08:14 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2013-08-21 12:08:14 +0200
commit828fa1e60117535d9b1e1b09444842ae66e8424d (patch)
tree281f5bff9a12c760ca947a98569df63c8ca85909 /drivers/mfd/88pm805.c
parent09fd86780bb4603df1886e17127f5beb97f70ffb (diff)
parent8a105ca202b1a1061a24f1e980206cd2808e2f8b (diff)
Merge tag 'mfd-lee-3.12-1' of git://git.linaro.org/people/ljones/mfd
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/88pm805.c')
-rw-r--r--drivers/mfd/88pm805.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/88pm805.c b/drivers/mfd/88pm805.c
index 521602231c7b..0686cdb06b3e 100644
--- a/drivers/mfd/88pm805.c
+++ b/drivers/mfd/88pm805.c
@@ -227,7 +227,7 @@ static int pm805_probe(struct i2c_client *client,
{
int ret = 0;
struct pm80x_chip *chip;
- struct pm80x_platform_data *pdata = client->dev.platform_data;
+ struct pm80x_platform_data *pdata = dev_get_platdata(&client->dev);
ret = pm80x_init(client);
if (ret) {