Commit bb0c6bfa authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

staging: comedi: COMEDI_BUFINFO: force bytes_written to 0 if stopped

The `COMEDI_BUFINFO` ioctl is used to advance the current position in
the buffer by a specified amount (which can be 0) and get the new
position.  On input, the `bytes_written` member of `struct
comedi_bufinfo` specifies the amount to advance the "write" position for
an asynchronous command in the "write" direction.  On output, the member
indicates the amount the "write" position has actually been advanced.
Advancing the "write" position is current done even if the command has
stopped and cannot use any more written data.  Change it to force the
amount successfully written to 0 in that case.
Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 06578561
...@@ -1155,6 +1155,8 @@ static int do_bufinfo_ioctl(struct comedi_device *dev, ...@@ -1155,6 +1155,8 @@ static int do_bufinfo_ioctl(struct comedi_device *dev,
bi.bytes_written = 0; bi.bytes_written = 0;
} else { } else {
/* command was set up in "write" direction */ /* command was set up in "write" direction */
if (!comedi_is_subdevice_running(s))
bi.bytes_written = 0;
if (bi.bytes_written) { if (bi.bytes_written) {
comedi_buf_write_alloc(s, bi.bytes_written); comedi_buf_write_alloc(s, bi.bytes_written);
bi.bytes_written = bi.bytes_written =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment