From daabc8a63154adef43df5eddadb8d0371a5cc06d Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 14 Jul 2014 12:23:54 -0700 Subject: [PATCH] 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/ni_mio_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- 2.34.1