aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/comedi_buf.c
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-01-10 10:38:20 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-17 16:56:01 -0800
commit215040e1238fa18caf5edf9bcd68126ecd8a6b2d (patch)
tree2f5a0f0c6987639f8ce0c83c5bace88399f7237f /drivers/staging/comedi/comedi_buf.c
parent6166ce878771edfe2d0fb9e719d5c4d4d4b82157 (diff)
staging: comedi: comedi_buf: remove noise in comedi_buf_read_free()
If an attempt is made to free more bytes than have been allocated a dev_info message is output and the number of bytes to free is adjusted to the allocated size. Telling the user this happened is just noise. Remove the message. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbobbi@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/comedi_buf.c')
-rw-r--r--drivers/staging/comedi/comedi_buf.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/comedi/comedi_buf.c b/drivers/staging/comedi/comedi_buf.c
index 17162d94273..9b997ae6779 100644
--- a/drivers/staging/comedi/comedi_buf.c
+++ b/drivers/staging/comedi/comedi_buf.c
@@ -324,11 +324,9 @@ unsigned int comedi_buf_read_free(struct comedi_async *async,
smp_mb();
allocated = comedi_buf_read_n_allocated(async);
- if (nbytes > allocated) {
- dev_info(async->subdevice->device->class_dev,
- "attempted to read-free more bytes than have been read-allocated.\n");
+ if (nbytes > allocated)
nbytes = allocated;
- }
+
async->buf_read_count += nbytes;
async->buf_read_ptr += nbytes;
async->buf_read_ptr %= async->prealloc_bufsz;