aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/comedi_buf.c
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-01-10 10:37:56 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-17 16:56:00 -0800
commit6166ce878771edfe2d0fb9e719d5c4d4d4b82157 (patch)
tree3d6752f441c0aaf8c6fe7ebee2ee3a8d7e10cdca /drivers/staging/comedi/comedi_buf.c
parenta8f40f463fda58b90206173be73dc199beb7395f (diff)
staging: comedi: comedi_buf: remove noise in comedi_buf_write_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 9d11f416398..17162d94273 100644
--- a/drivers/staging/comedi/comedi_buf.c
+++ b/drivers/staging/comedi/comedi_buf.c
@@ -252,11 +252,9 @@ unsigned int comedi_buf_write_free(struct comedi_async *async,
{
unsigned int allocated = comedi_buf_write_n_allocated(async);
- if (nbytes > allocated) {
- dev_info(async->subdevice->device->class_dev,
- "attempted to write-free more bytes than have been write-allocated.\n");
+ if (nbytes > allocated)
nbytes = allocated;
- }
+
async->buf_write_count += nbytes;
async->buf_write_ptr += nbytes;
comedi_buf_munge(async, async->buf_write_count - async->munge_count);