diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-05-09 11:20:04 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-05-09 11:20:04 (GMT) |
commit | 4096e645d85d575e7b6e699f470f5519c34fda5d (patch) | |
tree | 9cfb8e2c1a816e2f7142d20b79c578fdf69dd2f2 /drivers/iio/adc | |
parent | a0ca97b808c06793fd9dfb69243ce945c9fff501 (diff) | |
parent | 44549e8f5eea4e0a41b487b63e616cb089922b99 (diff) | |
download | linux-4096e645d85d575e7b6e699f470f5519c34fda5d.tar.xz |
Merge 4.6-rc7 into staging-next
This fixes some merge issues with some iio drivers that were found in
linux-next.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/adc')
-rw-r--r-- | drivers/iio/adc/at91-sama5d2_adc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c index 07adb10..e10dca3 100644 --- a/drivers/iio/adc/at91-sama5d2_adc.c +++ b/drivers/iio/adc/at91-sama5d2_adc.c @@ -497,6 +497,8 @@ static int at91_adc_probe(struct platform_device *pdev) if (ret) goto vref_disable; + platform_set_drvdata(pdev, indio_dev); + ret = iio_device_register(indio_dev); if (ret < 0) goto per_clk_disable_unprepare; |