diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2013-08-21 12:08:14 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-08-21 12:08:14 +0200 |
| commit | 828fa1e60117535d9b1e1b09444842ae66e8424d (patch) | |
| tree | 281f5bff9a12c760ca947a98569df63c8ca85909 /drivers/mfd/tps6105x.c | |
| parent | 09fd86780bb4603df1886e17127f5beb97f70ffb (diff) | |
| parent | 8a105ca202b1a1061a24f1e980206cd2808e2f8b (diff) | |
| download | linux-828fa1e60117535d9b1e1b09444842ae66e8424d.tar.bz2 | |
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/tps6105x.c')
| -rw-r--r-- | drivers/mfd/tps6105x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/tps6105x.c b/drivers/mfd/tps6105x.c index 1d302f583adf..b5dfa6e4e692 100644 --- a/drivers/mfd/tps6105x.c +++ b/drivers/mfd/tps6105x.c @@ -147,7 +147,7 @@ static int tps6105x_probe(struct i2c_client *client, i2c_set_clientdata(client, tps6105x); tps6105x->client = client; - pdata = client->dev.platform_data; + pdata = dev_get_platdata(&client->dev); tps6105x->pdata = pdata; mutex_init(&tps6105x->lock); |