Commit 9a2d58c7 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: hwdrv_apci1564: tidy up apci1564_timer_insn_write() 



Clear the gate and trig bits in the common code path.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d9fca73c

drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c

+2 −3
Original line number Diff line number Diff line
@@ -60,13 +60,12 @@ static int apci1564_timer_insn_write(struct comedi_device *dev, 
	unsigned int ctrl;



	ctrl = inl(devpriv->timer + ADDI_TCW_CTRL_REG);

	ctrl &= ~(ADDI_TCW_CTRL_GATE | ADDI_TCW_CTRL_TRIG);

	switch (data[1]) {

	case 0:	/* Stop The Timer */

		ctrl &= ~(ADDI_TCW_CTRL_GATE | ADDI_TCW_CTRL_TRIG |

			  ADDI_TCW_CTRL_ENA);

		ctrl &= ~ADDI_TCW_CTRL_ENA;

		break;

	case 1:	/* Enable the Timer */

		ctrl &= ~(ADDI_TCW_CTRL_GATE | ADDI_TCW_CTRL_TRIG);

		ctrl |= ADDI_TCW_CTRL_ENA;

		break;

	}