From eaff73d15c56c43639b82a3eabee8b4f48dd6936 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 13 Nov 2012 13:40:50 -0700 Subject: [PATCH] --- yaml --- r: 337863 b: refs/heads/master c: 722bf0f09f0931aab537400bee29f097ca218ba3 h: refs/heads/master i: 337861: d954c6714207037487748020c30b03d79092a602 337859: 36ace14ddb74ddb38d66b86e76029cccf41249f9 337855: f7a238b37d0d6d15d4b9ab82abf5aa880edc4b45 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/addi_apci_1516.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0ae1c69595fd..3e3e1378d2a3 100644 --- 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 index c3e167d04303..c1caeb1e525b 100644 --- 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);