Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit daabc8a6 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c5f26499

drivers/staging/comedi/drivers/ni_mio_common.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -5559,11 +5559,11 @@ static int ni_E_init(struct comedi_device *dev, 
			s->subdev_flags |= SDF_CMD_WRITE;

			s->subdev_flags |= SDF_CMD_WRITE;

			s->do_cmd = &ni_ao_cmd;

			s->do_cmd = &ni_ao_cmd;

			s->do_cmdtest = &ni_ao_cmdtest;

			s->do_cmdtest = &ni_ao_cmdtest;

			s->cancel = &ni_ao_reset;

			s->len_chanlist = board->n_aochan;

			s->len_chanlist = board->n_aochan;

			if (!devpriv->is_m_series)

			if (!devpriv->is_m_series)

				s->munge = ni_ao_munge;

				s->munge = ni_ao_munge;

		}

		}

		s->cancel = &ni_ao_reset;

	} else {

	} else {

		s->type = COMEDI_SUBD_UNUSED;

		s->type = COMEDI_SUBD_UNUSED;

	}

	}