Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / 88pm805.c

diff --git a/drivers/mfd/88pm805.c b/drivers/mfd/88pm805.c
index 521602231c7bc43c8ec007f078ae5c4d38bcaa7d..8a5b6ffb5afb6fbedbd8a1364a879890a6ebfba5 100644 (file)
--- 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) {
@@ -243,7 +243,7 @@ static int pm805_probe(struct i2c_client *client,
                goto err_805_init;
        }
 
-       if (pdata->plat_config)
+       if (pdata && pdata->plat_config)
                pdata->plat_config(chip, pdata);
 
 err_805_init: