xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 4.6-rc7 into staging-next

Browse Source 
This fixes some merge issues with some iio drivers that were found in
linux-next.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2016-05-09 13:20:04 +02:00
parent a0ca97b808 44549e8f5e
commit 4096e645d8
738 changed files with 7447 additions and 4018 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/iio/adc/at91-sama5d2_adc.c
View File

@@ -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;