Merge tag 'iio-fixes-for-3.15a' of...
Merge tag 'iio-fixes-for-3.15a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus Jonathan writes: First found of IIO fixes for the 3.15 cycle. * Fix the platform data support for the at91 adc driver. * A couple of related follow up patches get the support working again for at91sam9260 and at91sam9g45 as the earlier patch results in a device name change. * A default timer value in the at91 adc driver was bonkers. Make it sane. * Fix incorrect reporting of the integration time for the cm32181 light sensor * Fix a missing break in the ad2s1200 driver which would have give a false error return. * Make sure buffer scan mask queries from userspace return 0/1 rather than a fairly random value depending on their implementation of test_bit * Fix leak of the i2c client and a null pointer dereference in the cm36651 driver. * Fix a build warning on avr32 for the mxs-lradc (not exactly a critical combination - but the issue was real).
Showing
- arch/arm/mach-at91/at91sam9260_devices.c 1 addition, 1 deletionarch/arm/mach-at91/at91sam9260_devices.c
- arch/arm/mach-at91/at91sam9g45_devices.c 1 addition, 1 deletionarch/arm/mach-at91/at91sam9g45_devices.c
- drivers/iio/adc/at91_adc.c 27 additions, 6 deletionsdrivers/iio/adc/at91_adc.c
- drivers/iio/industrialio-buffer.c 4 additions, 2 deletionsdrivers/iio/industrialio-buffer.c
- drivers/iio/light/cm32181.c 1 addition, 0 deletionsdrivers/iio/light/cm32181.c
- drivers/iio/light/cm36651.c 20 additions, 2 deletionsdrivers/iio/light/cm36651.c
- drivers/staging/iio/adc/mxs-lradc.c 1 addition, 1 deletiondrivers/staging/iio/adc/mxs-lradc.c
- drivers/staging/iio/resolver/ad2s1200.c 1 addition, 0 deletionsdrivers/staging/iio/resolver/ad2s1200.c
Loading
Please register or sign in to comment