diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-23 06:29:20 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-23 06:29:20 +0200 |
commit | 8b425aa193439a2b60a988a9230f1de753e36902 (patch) | |
tree | 05854e1d5bc19cfe25a782b2cc919ba5519cb8ef /drivers/iio/light/cm32181.c | |
parent | Linux 3.15-rc2 (diff) | |
parent | iio: adc: mxs-lradc: fix warning when buidling on avr32 (diff) | |
download | linux-8b425aa193439a2b60a988a9230f1de753e36902.tar.xz linux-8b425aa193439a2b60a988a9230f1de753e36902.zip |
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).
Diffstat (limited to 'drivers/iio/light/cm32181.c')
-rw-r--r-- | drivers/iio/light/cm32181.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iio/light/cm32181.c b/drivers/iio/light/cm32181.c index 47a6dbac2d0c..d976e6ce60db 100644 --- a/drivers/iio/light/cm32181.c +++ b/drivers/iio/light/cm32181.c @@ -221,6 +221,7 @@ static int cm32181_read_raw(struct iio_dev *indio_dev, *val = cm32181->calibscale; return IIO_VAL_INT; case IIO_CHAN_INFO_INT_TIME: + *val = 0; ret = cm32181_read_als_it(cm32181, val2); return ret; } |