diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-27 10:34:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-27 10:34:29 -0700 |
| commit | d0c15ad760c869f3d676b37c2989baa1566d31f1 (patch) | |
| tree | db1654d6324d0519fd39b91fb172df2654ee2c93 /drivers/iio/light/cm32181.c | |
| parent | 005fbcd03458b6c0044f65c1fe8d8a68d726a321 (diff) | |
| parent | 2704f807f9498054b8153002bafa3e818079e9a5 (diff) | |
| download | linux-d0c15ad760c869f3d676b37c2989baa1566d31f1.tar.bz2 | |
Merge tag 'staging-3.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging / IIO driver fixes from Greg KH:
"Here are some small staging and IIO driver fixes for 3.15-rc3.
Nothing major at all, just some assorted issues that people have
reported"
* tag 'staging-3.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: comedi: usbdux: bug fix for accessing 'ao_chanlist' in private data
iio: adc: mxs-lradc: fix warning when buidling on avr32
iio: cm36651: Fix i2c client leak and possible NULL pointer dereference
iio: querying buffer scan_mask should return 0/1
staging:iio:ad2s1200 fix a missing break
iio: adc: at91_adc: correct default shtim value
ARM: at91: at91sam9260: change at91_adc name
ARM: at91: at91sam9g45: change at91_adc name
iio: cm32181: Fix read integration time function
iio: adc: at91_adc: Repair broken platform_data support
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; } |