]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: ni_labpc: don't clear cmd3 bits explicitly in labpc_ai_cmd()
authorIan Abbott <abbotti@mev.co.uk>
Fri, 28 Jun 2013 16:09:18 +0000 (17:09 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 23 Jul 2013 21:27:51 +0000 (14:27 -0700)
`labpc_ai_cmd()` calls `labpc_cancel()` which already sets
`devpriv->cmd3` to 0.  Remove the lines from `labpc_ai_cmd()` that clear
specific bits in `devpriv->cmd3` explicitly as they have no effect.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/ni_labpc.c

index 4ff1ed0c8fa855dc4ff3e37e664b6b1759137614..65ab8f6c5b69beabf259f023d51318342572bc1a 100644 (file)
@@ -976,8 +976,7 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
                release_dma_lock(irq_flags);
                /*  enable board's dma */
                devpriv->cmd3 |= (CMD3_DMAEN | CMD3_DMATCINTEN);
-       } else
-               devpriv->cmd3 &= ~(CMD3_DMAEN | CMD3_DMATCINTEN);
+       }
 #endif
 
        /*  enable error interrupts */
@@ -985,8 +984,6 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
        /*  enable fifo not empty interrupt? */
        if (xfer == fifo_not_empty_transfer)
                devpriv->cmd3 |= CMD3_FIFOINTEN;
-       else
-               devpriv->cmd3 &= ~CMD3_FIFOINTEN;
        devpriv->write_byte(devpriv->cmd3, dev->iobase + CMD3_REG);
 
        /*  setup any external triggering/pacing (cmd4 register) */