diff options
| author | H Hartley Sweeten <[email protected]> | 2014-07-14 12:23:54 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2014-07-16 13:24:43 -0700 |
| commit | daabc8a63154adef43df5eddadb8d0371a5cc06d (patch) | |
| tree | 485c54d6fdcea43526b93165cb73f0b5d1d68ec7 | |
| parent | c5f26499998476edf599b599cd88163305dee5b2 (diff) | |
staging: comedi: ni_mio_common: (*cancel) only works with async cmd support
The comedi subdevice (*cancel) function can only be called by the core if the
subdevice supports async commands. Move the initialization of this callback
to it is only set if async commands are enabled.
Signed-off-by: H Hartley Sweeten <[email protected]>
Reviewed-by: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_mio_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index 8303d66220a0..2ab267b04a96 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -5559,11 +5559,11 @@ static int ni_E_init(struct comedi_device *dev, s->subdev_flags |= SDF_CMD_WRITE; s->do_cmd = &ni_ao_cmd; s->do_cmdtest = &ni_ao_cmdtest; + s->cancel = &ni_ao_reset; s->len_chanlist = board->n_aochan; if (!devpriv->is_m_series) s->munge = ni_ao_munge; } - s->cancel = &ni_ao_reset; } else { s->type = COMEDI_SUBD_UNUSED; } |