From: H Hartley Sweeten Date: Thu, 10 Jan 2013 17:37:56 +0000 (-0700) Subject: staging: comedi: comedi_buf: remove noise in comedi_buf_write_free() X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6166ce878771edfe2d0fb9e719d5c4d4d4b82157;p=openwrt%2Fstaging%2Fblogic.git 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 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 9d11f4163984..17162d94273b 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);