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@xxxxxxxxxxxxxxxxxxx>
Cc: Ian Abbott <abbotti@xxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
