diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-11 18:30:50 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-11 18:30:50 +0200 |
commit | 5f47992491ffe2d5b2b4ea3556bc0f3c0ec9bc8b (patch) | |
tree | f43f81ab67d152c148bd3dfc1a0683d2c8306014 /drivers/iio/light | |
parent | staging: vme: fix bare use of 'unsigned' (diff) | |
parent | Linux 4.6-rc3 (diff) | |
download | linux-5f47992491ffe2d5b2b4ea3556bc0f3c0ec9bc8b.tar.xz linux-5f47992491ffe2d5b2b4ea3556bc0f3c0ec9bc8b.zip |
Merge 4.6-rc3 into staging-next
This resolves a lot of merge issues with PAGE_CACHE_* changes, and an
iio driver merge issue.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/light')
-rw-r--r-- | drivers/iio/light/apds9960.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iio/light/apds9960.c b/drivers/iio/light/apds9960.c index f6a07dc32ae4..a6af56ad10e1 100644 --- a/drivers/iio/light/apds9960.c +++ b/drivers/iio/light/apds9960.c @@ -769,7 +769,7 @@ static void apds9960_read_gesture_fifo(struct apds9960_data *data) mutex_lock(&data->lock); data->gesture_mode_running = 1; - while (cnt-- || (cnt = apds9660_fifo_is_empty(data) > 0)) { + while (cnt || (cnt = apds9660_fifo_is_empty(data) > 0)) { ret = regmap_bulk_read(data->regmap, APDS9960_REG_GFIFO_BASE, &data->buffer, 4); @@ -777,6 +777,7 @@ static void apds9960_read_gesture_fifo(struct apds9960_data *data) goto err_read; iio_push_to_buffers(data->indio_dev, data->buffer); + cnt--; } err_read: |