From: Ian Abbott Date: Fri, 28 Jun 2013 16:09:18 +0000 (+0100) Subject: staging: comedi: ni_labpc: don't clear cmd3 bits explicitly in labpc_ai_cmd() X-Git-Tag: upstream/snapshot3+hdmi~4473^2~730 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f12a34ca0b7f02f725965f39f9ccf5d5c339d3e0;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git 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 Signed-off-by: Greg Kroah-Hartman --- 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) */