]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
staging: comedi: das16: remove unnecessary das16_ai_disable()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Mon, 26 Jan 2015 23:17:14 +0000 (16:17 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Jan 2015 19:14:04 +0000 (11:14 -0800)
The das16_ai_disable() function disables interrupts and the pacer clock. This
function is called by the subdevice (*cancel) operation.

The comedi core will not call a subdevice (*insn_read) operation while an
async command is running due to the s->busy check in parse_insn(). Since all
async commands are terminated by a (*cancel), the das16_ai_disable() is not
necessary in das16_ai_insn_read(). Remove it.

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>
drivers/staging/comedi/drivers/das16.c

index 417ea755f42bfe864243b366fa64427add0998f1..97e5e7dca954671875ce1e8acb60001bf7d131b6 100644 (file)
@@ -831,8 +831,6 @@ static int das16_ai_insn_read(struct comedi_device *dev,
        int ret;
        int i;
 
-       das16_ai_disable(dev);
-
        /* set multiplexer */
        outb(chan | (chan << 4), dev->iobase + DAS16_MUX_REG);