diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2013-08-21 06:08:14 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-08-21 06:08:14 -0400 |
commit | 828fa1e60117535d9b1e1b09444842ae66e8424d (patch) | |
tree | 281f5bff9a12c760ca947a98569df63c8ca85909 /drivers/mfd/da903x.c | |
parent | 09fd86780bb4603df1886e17127f5beb97f70ffb (diff) | |
parent | 8a105ca202b1a1061a24f1e980206cd2808e2f8b (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/da903x.c')
-rw-r--r-- | drivers/mfd/da903x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/da903x.c b/drivers/mfd/da903x.c index f1a316e0d6a6..e0a2e0ee603b 100644 --- a/drivers/mfd/da903x.c +++ b/drivers/mfd/da903x.c | |||
@@ -494,7 +494,7 @@ failed: | |||
494 | static int da903x_probe(struct i2c_client *client, | 494 | static int da903x_probe(struct i2c_client *client, |
495 | const struct i2c_device_id *id) | 495 | const struct i2c_device_id *id) |
496 | { | 496 | { |
497 | struct da903x_platform_data *pdata = client->dev.platform_data; | 497 | struct da903x_platform_data *pdata = dev_get_platdata(&client->dev); |
498 | struct da903x_chip *chip; | 498 | struct da903x_chip *chip; |
499 | unsigned int tmp; | 499 | unsigned int tmp; |
500 | int ret; | 500 | int ret; |