Merge remote-tracking branch 'nouveau/drm-nouveau-next' into drm-fixes

[deliverable/linux.git] / drivers / mfd / ucb1400_core.c

diff --git a/drivers/mfd/ucb1400_core.c b/drivers/mfd/ucb1400_core.c
index e9031fa9d53d1983e0dfe5ee5307bf8d24f79857..ebb20edf9c1758a7d6e58ddce9f856dd89bbd860 100644 (file)
--- a/drivers/mfd/ucb1400_core.c
+++ b/drivers/mfd/ucb1400_core.c
@@ -52,7 +52,7 @@ static int ucb1400_core_probe(struct device *dev)
        struct ucb1400_ts ucb_ts;
        struct ucb1400_gpio ucb_gpio;
        struct snd_ac97 *ac97;
-       struct ucb1400_pdata *pdata = dev->platform_data;
+       struct ucb1400_pdata *pdata = dev_get_platdata(dev);
 
        memset(&ucb_ts, 0, sizeof(ucb_ts));
        memset(&ucb_gpio, 0, sizeof(ucb_gpio));