diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-23 09:29:06 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-23 09:29:06 +0100 |
commit | 9579c4dc21292f375715d7acca439dac9855b3e9 (patch) | |
tree | caf374a799c6c5f8bdf865d7fc0e936e9685f4ca /drivers/iio/health/max30100.c | |
parent | a121103c922847ba5010819a3f250f1f7fc84ab8 (diff) | |
parent | 5c113b5e0082e90d2e1c7b12e96a7b8cf0623e27 (diff) | |
download | linux-stable-9579c4dc21292f375715d7acca439dac9855b3e9.tar.gz linux-stable-9579c4dc21292f375715d7acca439dac9855b3e9.tar.bz2 linux-stable-9579c4dc21292f375715d7acca439dac9855b3e9.zip |
Merge tag 'iio-fixes-for-4.10b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
Jonathan writes:
Second set of IIO fixes for the 4.10 cycle.
* afe4403
- retrieve valid iio_dev in suspend / resume. Previously using the wrong
dev for a call to dev_to_iio_dev.
* afe4404
- retrieve valid iio_dev in suspend / resume. Previously using the wrong
dev for a call to dev_to_iio_dev.
* dht11
- Something seems to have caused a regression in timing on the raspberry pi
2B. However, the bug that it threw up was real. msleep was occasionally
resulting in very long sleeps, over the limit possible to read from this
chip. Switch to usleep_range to avoid this. The timing needed by this
part is very fiddly.
* max30100
- wrong parenthesis around fifo count check meant it always read after the
almost_full state had been reached. I've tagged this with a fixes tag which
covers the last patch that it will not need precursor patches. The bug
predates that but will need backporting.
* palmas_gpadc.
- retrieve valid iio_dev in suspend / resume. Previously using the wrong
dev for a call to dev_to_iio_dev.
Diffstat (limited to 'drivers/iio/health/max30100.c')
-rw-r--r-- | drivers/iio/health/max30100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/health/max30100.c b/drivers/iio/health/max30100.c index 90ab8a2d2846..183c14329d6e 100644 --- a/drivers/iio/health/max30100.c +++ b/drivers/iio/health/max30100.c @@ -238,7 +238,7 @@ static irqreturn_t max30100_interrupt_handler(int irq, void *private) mutex_lock(&data->lock); - while (cnt || (cnt = max30100_fifo_count(data) > 0)) { + while (cnt || (cnt = max30100_fifo_count(data)) > 0) { ret = max30100_read_measurement(data); if (ret) break; |