---

yaml --- r: 337863 b: refs/heads/master c: 722bf0f h: refs/heads/master i: 337861: d954c67 337859: 36ace14 337855: f7a238b v: v3
git-mirror · Nov 13, 2012 · eaff73d · eaff73d
1 parent 45210a5
commit eaff73d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b9323b43d0c0914a852be6ed991f2fb421cb1f2
+refs/heads/master: 722bf0f09f0931aab537400bee29f097ca218ba3
diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_1516.c b/trunk/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);