diff options
| author | Ian Abbott <abbotti@mev.co.uk> | 2013-06-28 16:09:18 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-23 21:27:51 (GMT) |
| commit | f12a34ca0b7f02f725965f39f9ccf5d5c339d3e0 (patch) | |
| tree | 4ca230d8a89b29c6bafdd3d95784d2149c2fae46 | |
| parent | 725a70d8a68ef5368652c0c49631fefb361d62cf (diff) | |
| download | linux-fsl-qoriq-f12a34ca0b7f02f725965f39f9ccf5d5c339d3e0.tar.xz | |
staging: comedi: ni_labpc: don't clear cmd3 bits explicitly in labpc_ai_cmd()
`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>
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_labpc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c index 4ff1ed0..65ab8f6 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.c +++ b/drivers/staging/comedi/drivers/ni_labpc.c @@ -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) */ |