Skip to content

Commit

Permalink
staging: comedi: comedi_buf: clarify comedi_buf_read_free()
Browse files Browse the repository at this point in the history
Reword the comment about the need for the smp_mb().

Clarify the check to make sure the number of bytes to free is not
more than the number of bytes allocated.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jan 18, 2013
1 parent 034cbd1 commit 3abfa10
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions drivers/staging/comedi/comedi_buf.c
Original file line number Diff line number Diff line change
Expand Up @@ -312,14 +312,19 @@ EXPORT_SYMBOL(comedi_buf_read_alloc);
/* transfers control of a chunk from reader to free buffer space */
unsigned comedi_buf_read_free(struct comedi_async *async, unsigned int nbytes)
{
/* barrier insures data has been read out of
* buffer before read count is incremented */
unsigned int allocated;

/*
* ensure data has been read out of buffer before
* the async read count is incremented
*/
smp_mb();
if ((int)(async->buf_read_count + nbytes -
async->buf_read_alloc_count) > 0) {

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");
nbytes = async->buf_read_alloc_count - async->buf_read_count;
nbytes = allocated;
}
async->buf_read_count += nbytes;
async->buf_read_ptr += nbytes;
Expand Down

0 comments on commit 3abfa10

Please sign in to comment.