From: H Hartley Sweeten Date: Thu, 10 Jan 2013 17:38:20 +0000 (-0700) Subject: staging: comedi: comedi_buf: remove noise in comedi_buf_read_free() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=215040e1238fa18caf5edf9bcd68126ecd8a6b2d;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git 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 Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/comedi_buf.c b/drivers/staging/comedi/comedi_buf.c index 17162d94273b..9b997ae67796 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;