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

staging: comedi: me4000: fix me4000_ai_cancel() 



The STOP and IMMEDIATE_STOP bits in the ME4000_AI_CTRL_REG should be set,
not cleared, to stop any running conversions.

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 ffaeab34

drivers/staging/comedi/drivers/me4000.c

+4 −4
Original line number Diff line number Diff line
@@ -529,12 +529,12 @@ static int me4000_ai_insn_read(struct comedi_device *dev, 
static int me4000_ai_cancel(struct comedi_device *dev,

			    struct comedi_subdevice *s)

{

	unsigned int tmp;

	unsigned int ctrl;



	/* Stop any running conversion */

	tmp = inl(dev->iobase + ME4000_AI_CTRL_REG);

	tmp &= ~(ME4000_AI_CTRL_STOP | ME4000_AI_CTRL_IMMEDIATE_STOP);

	outl(tmp, dev->iobase + ME4000_AI_CTRL_REG);

	ctrl = inl(dev->iobase + ME4000_AI_CTRL_REG);

	ctrl |= ME4000_AI_CTRL_STOP | ME4000_AI_CTRL_IMMEDIATE_STOP;

	outl(ctrl, dev->iobase + ME4000_AI_CTRL_REG);



	/* Clear the control register */

	outl(0x0, dev->iobase + ME4000_AI_CTRL_REG);

CRA Git | Maintained and supported by SUSTech CRA and CCSE