summaryrefslogtreecommitdiff
path: root/drivers/iio/kfifo_buf.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-05-27 10:17:21 +0300
committerIngo Molnar <mingo@kernel.org>2015-05-27 10:17:21 +0300
commit8d12ded3dd499e38e8022fe3ec53920d085e57a3 (patch)
tree8b73e5a68f24b0bd33430bed8993de979825ffcf /drivers/iio/kfifo_buf.c
parentd499c106843afa0703a68c64662bf42a16421aec (diff)
parent68ab747604da98f0a0414f197f346ac22888fcee (diff)
downloadlinux-8d12ded3dd499e38e8022fe3ec53920d085e57a3.tar.xz
Merge branch 'perf/urgent' into perf/core, before applying dependent patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/iio/kfifo_buf.c')
-rw-r--r--drivers/iio/kfifo_buf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iio/kfifo_buf.c b/drivers/iio/kfifo_buf.c
index 847ca561afe0..55c267bbfd2f 100644
--- a/drivers/iio/kfifo_buf.c
+++ b/drivers/iio/kfifo_buf.c
@@ -38,7 +38,8 @@ static int iio_request_update_kfifo(struct iio_buffer *r)
kfifo_free(&buf->kf);
ret = __iio_allocate_kfifo(buf, buf->buffer.bytes_per_datum,
buf->buffer.length);
- buf->update_needed = false;
+ if (ret >= 0)
+ buf->update_needed = false;
} else {
kfifo_reset_out(&buf->kf);
}