Merge tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubifs

[~andy/linux] / drivers / mfd / 88pm860x-core.c

diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
index eeb481d426b5df159264cc28e4bd56210c1ae1e0..7ebe9ef1eba663006399ec1b52f327e3fd3d0e47 100644 (file)
--- a/drivers/mfd/88pm860x-core.c
+++ b/drivers/mfd/88pm860x-core.c
@@ -1130,7 +1130,7 @@ static int pm860x_dt_init(struct device_node *np,
 static int pm860x_probe(struct i2c_client *client,
                                  const struct i2c_device_id *id)
 {
-       struct pm860x_platform_data *pdata = client->dev.platform_data;
+       struct pm860x_platform_data *pdata = dev_get_platdata(&client->dev);
        struct device_node *node = client->dev.of_node;
        struct pm860x_chip *chip;
        int ret;