Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f12a34ca authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

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: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 725a70d8

drivers/staging/comedi/drivers/ni_labpc.c

+1 −4
Original line number Diff line number Diff line
@@ -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) */