From: Ian Abbott <abbotti@mev.co.uk>
To: devel@driverdev.osuosl.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Ian Abbott <abbotti@mev.co.uk>,
H Hartley Sweeten <hsweeten@visionengravers.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 3/8] staging: comedi: COMEDI_BUFINFO: update buffer before becoming non-busy
Date: Fri, 19 Feb 2016 16:13:52 +0000 [thread overview]
Message-ID: <1455898437-4640-4-git-send-email-abbotti@mev.co.uk> (raw)
In-Reply-To: <1455898437-4640-1-git-send-email-abbotti@mev.co.uk>
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. For an asynchronous command in the "read" direction, if the
command has finished acquiring data normally, `do_become_nonbusy()` is
called to terminate the command. That resets the buffer position, and
currently, the position information returned back to the user is after
the buffer has been reset. It should be more useful to return the
buffer position before the reset, so move the call to
`do_become_nonbusy()` after the code that gets the updated buffer
position.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/comedi_fops.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 04d6040..e625ef2 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -1111,6 +1111,7 @@ static int do_bufinfo_ioctl(struct comedi_device *dev,
struct comedi_bufinfo bi;
struct comedi_subdevice *s;
struct comedi_async *async;
+ bool become_nonbusy = false;
if (copy_from_user(&bi, arg, sizeof(bi)))
return -EFAULT;
@@ -1149,7 +1150,7 @@ static int do_bufinfo_ioctl(struct comedi_device *dev,
if (comedi_is_subdevice_idle(s) &&
comedi_buf_read_n_available(s) == 0)
- do_become_nonbusy(dev, s);
+ become_nonbusy = true;
}
bi.bytes_written = 0;
} else {
@@ -1168,6 +1169,9 @@ copyback_position:
bi.buf_read_count = async->buf_read_count;
bi.buf_read_ptr = async->buf_read_ptr;
+ if (become_nonbusy)
+ do_become_nonbusy(dev, s);
+
copyback:
if (copy_to_user(arg, &bi, sizeof(bi)))
return -EFAULT;
--
2.7.0
next prev parent reply other threads:[~2016-02-19 16:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-19 16:13 staging: comedi: COMEDI_BUFINFO: some behavioural changes Ian Abbott
2016-02-19 16:13 ` [PATCH 1/8] staging: comedi: COMEDI_BUFINFO: get amount freed, not amount allocated Ian Abbott
2016-02-19 16:13 ` [PATCH 2/8] staging: comedi: COMEDI_BUFINFO: force bytes_read or bytes_written to 0 Ian Abbott
2016-02-19 16:13 ` Ian Abbott [this message]
2016-02-19 16:13 ` [PATCH 4/8] staging: comedi: COMEDI_BUFINFO: force bytes_written to 0 if stopped Ian Abbott
2016-02-19 16:13 ` [PATCH 5/8] staging: comedi: COMEDI_BUFINFO: return error if no active command Ian Abbott
2016-02-19 16:13 ` [PATCH 6/8] staging: comedi: COMEDI_BUFINFO: become non-busy even if bytes_read is 0 Ian Abbott
2016-02-19 16:13 ` [PATCH 7/8] staging: comedi: COMEDI_BUFINFO: return -EPIPE for abnormal read Ian Abbott
2016-02-19 16:13 ` [PATCH 8/8] staging: comedi: COMEDI_BUFINFO: terminate "write" command when stopped Ian Abbott
2016-02-19 16:19 ` staging: comedi: COMEDI_BUFINFO: some behavioural changes Ian Abbott
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455898437-4640-4-git-send-email-abbotti@mev.co.uk \
--to=abbotti@mev.co.uk \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=hsweeten@visionengravers.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®