From 08235d09a4dccce10eda11b534375366013192d6 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Thu, 10 Jan 2013 10:38:20 -0700 Subject: [PATCH] --- yaml --- r: 354037 b: refs/heads/master c: 215040e1238fa18caf5edf9bcd68126ecd8a6b2d h: refs/heads/master i: 354035: 5f7402680ed11b2829d7c0649a4c0f7f5c1e04eb v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedi_buf.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1337e56f7c7d..61435a73368f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6166ce878771edfe2d0fb9e719d5c4d4d4b82157 +refs/heads/master: 215040e1238fa18caf5edf9bcd68126ecd8a6b2d diff --git a/trunk/drivers/staging/comedi/comedi_buf.c b/trunk/drivers/staging/comedi/comedi_buf.c index 17162d94273b..9b997ae67796 100644 --- a/trunk/drivers/staging/comedi/comedi_buf.c +++ b/trunk/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;