diff options
| author | Ian Abbott | 2014-05-06 14:12:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-05-23 14:25:49 +0200 |
| commit | fcc18a9aa2c43765ba37012879936fbf142ba91c (patch) | |
| tree | c4a337bf5b654ae42c045aae6302bd8a99af7e13 /drivers/staging/comedi/comedi_fops.c | |
| parent | staging: comedi: pass subdevice to comedi_buf_read_n_available() (diff) | |
| download | kernel-qcow2-linux-fcc18a9aa2c43765ba37012879936fbf142ba91c.tar.gz kernel-qcow2-linux-fcc18a9aa2c43765ba37012879936fbf142ba91c.tar.xz kernel-qcow2-linux-fcc18a9aa2c43765ba37012879936fbf142ba91c.zip | |
staging: comedi: pass subdevice to comedi_buf_reset()
Change the parameters of `comedi_buf_reset()` to pass a pointer to the
comedi subdevice instead of a pointer to the "async" structure belonging
to the subdevice.
The main aim at the moment is to replace all the `struct comedi_async *`
parameters with `struct comedi_subdevice *` parameters in the comedi
driver API.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/comedi_fops.c')
| -rw-r--r-- | drivers/staging/comedi/comedi_fops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index ada6024be6ee..98229bd6cfb2 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -583,7 +583,7 @@ static void do_become_nonbusy(struct comedi_device *dev, comedi_set_subdevice_runflags(s, SRF_RUNNING, 0); if (async) { - comedi_buf_reset(async); + comedi_buf_reset(s); async->inttrig = NULL; kfree(async->cmd.chanlist); async->cmd.chanlist = NULL; @@ -1557,7 +1557,7 @@ static int do_cmd_ioctl(struct comedi_device *dev, goto cleanup; } - comedi_buf_reset(async); + comedi_buf_reset(s); async->cb_mask = COMEDI_CB_EOA | COMEDI_CB_BLOCK | COMEDI_CB_ERROR | |