Merge tag 'iio-for-4.7a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio...

[karo-tx-linux.git] / drivers / staging / iio / trigger / iio-trig-bfin-timer.c

diff --git a/drivers/staging/iio/trigger/iio-trig-bfin-timer.c b/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
index aeafad41f9c0a8e0dcffb80193eb10f04a2919b4..38dca69a06eb47462458dbc3dfd8b448c10f5349 100644 (file)
--- a/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
+++ b/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
@@ -178,7 +178,7 @@ static const struct iio_trigger_ops iio_bfin_tmr_trigger_ops = {
 
 static int iio_bfin_tmr_trigger_probe(struct platform_device *pdev)
 {
-       struct iio_bfin_timer_trigger_pdata *pdata = pdev->dev.platform_data;
+       struct iio_bfin_timer_trigger_pdata *pdata;
        struct bfin_tmr_state *st;
        unsigned int config;
        int ret;
@@ -221,6 +221,7 @@ static int iio_bfin_tmr_trigger_probe(struct platform_device *pdev)
 
        config = PWM_OUT | PERIOD_CNT | IRQ_ENA;
 
+       pdata = dev_get_platdata(&pdev->dev);
        if (pdata && pdata->output_enable) {
                unsigned long long val;