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

Commit f89ced89 authored by Chase Southwood's avatar Chase Southwood Committed by Greg Kroah-Hartman
Browse files

staging: comedi: addi_apci_1564: fix use of apci1564_reset() to disable DI interrupts 



apci1564_cos_insn_config() is currently using apci1564_reset() to disable
digital input interrupts when the configuration operation is
COMEDI_DIGITAL_TRIG_DISABLE.  However, this is incorrect as the device reset
function also resets the registers for the digital outputs, timer, watchdog, and
counters as well.  Replace the reset function call with a direct disabling of
just the digital input interrupts.

Signed-off-by: default avatarChase Southwood <chase.southwood@gmail.com>
Cc: H 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 f94f771c

drivers/staging/comedi/drivers/addi_apci_1564.c

+4 −1
Original line number Diff line number Diff line
@@ -285,7 +285,10 @@ static int apci1564_cos_insn_config(struct comedi_device *dev, 
			devpriv->ctrl = 0;

			devpriv->mode1 = 0;

			devpriv->mode2 = 0;

			apci1564_reset(dev);

			outl(0x0, devpriv->amcc_iobase + APCI1564_DI_IRQ_REG);

			inl(devpriv->amcc_iobase + APCI1564_DI_INT_STATUS_REG);

			outl(0x0, devpriv->amcc_iobase + APCI1564_DI_INT_MODE1_REG);

			outl(0x0, devpriv->amcc_iobase + APCI1564_DI_INT_MODE2_REG);

			break;

		case COMEDI_DIGITAL_TRIG_ENABLE_EDGES:

			if (devpriv->ctrl != (APCI1564_DI_INT_ENABLE |