Merge tag 'ecryptfs-3.12-rc1-crypt-ctx' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / da9052-core.c

diff --git a/drivers/mfd/da9052-core.c b/drivers/mfd/da9052-core.c
index a3c9613f91664e87ae03f4496c3360df74c755ef..ea28a33576e45cd3c3df406a09264bd69a5c3298 100644 (file)
--- a/drivers/mfd/da9052-core.c
+++ b/drivers/mfd/da9052-core.c
@@ -534,7 +534,7 @@ EXPORT_SYMBOL_GPL(da9052_regmap_config);
 
 int da9052_device_init(struct da9052 *da9052, u8 chip_id)
 {
-       struct da9052_pdata *pdata = da9052->dev->platform_data;
+       struct da9052_pdata *pdata = dev_get_platdata(da9052->dev);
        int ret;
 
        mutex_init(&da9052->auxadc_lock);