[PATCH 13/41] staging: comedi: addi_apci_1516: don't reset the apci1016 board

H Hartley Sweeten hartleys at visionengravers.com
Tue Nov 13 20:40:50 UTC 2012


The apci1016 board only has digital inputs. There is no reason to
reset the digital outputs and watchdog timer on that board.

Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 drivers/staging/comedi/drivers/addi_apci_1516.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/staging/comedi/drivers/addi_apci_1516.c b/drivers/staging/comedi/drivers/addi_apci_1516.c
index c3e167d..c1caeb1 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1516.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1516.c
@@ -63,8 +63,12 @@ static irqreturn_t v_ADDI_Interrupt(int irq, void *d)
 
 static int apci1516_reset(struct comedi_device *dev)
 {
+	const struct addi_board *this_board = comedi_board(dev);
 	struct addi_private *devpriv = dev->private;
 
+	if (!this_board->i_Timer)
+		return 0;
+
 	outw(0x0, devpriv->iobase + APCI1516_DO_REG);
 	outw(0x0, devpriv->i_IobaseAddon + APCI1516_WDOG_CTRL_REG);
 	outw(0x0, devpriv->i_IobaseAddon + APCI1516_WDOG_RELOAD_LSB_REG);
-- 
1.7.11




More information about the devel mailing list