hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2015-08-05 10:45:10 -07:00 committed by Greg Kroah-Hartman
parent ffaeab349d
commit 6847df631f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/comedi/drivers/me4000.c
View File

@ -529,12 +529,12 @@ static int me4000_ai_insn_read(struct comedi_device *dev,
static int me4000_ai_cancel(struct comedi_device *dev, static int me4000_ai_cancel(struct comedi_device *dev,
struct comedi_subdevice *s) struct comedi_subdevice *s)
{ {
unsigned int tmp; unsigned int ctrl;
/* Stop any running conversion */ /* Stop any running conversion */
tmp = inl(dev->iobase + ME4000_AI_CTRL_REG); ctrl = inl(dev->iobase + ME4000_AI_CTRL_REG);
tmp &= ~(ME4000_AI_CTRL_STOP | ME4000_AI_CTRL_IMMEDIATE_STOP); ctrl |= ME4000_AI_CTRL_STOP | ME4000_AI_CTRL_IMMEDIATE_STOP;
outl(tmp, dev->iobase + ME4000_AI_CTRL_REG); outl(ctrl, dev->iobase + ME4000_AI_CTRL_REG);
/* Clear the control register */ /* Clear the control register */
outl(0x0, dev->iobase + ME4000_AI_CTRL_REG); outl(0x0, dev->iobase + ME4000_AI_CTRL_REG);