---

yaml --- r: 337884 b: refs/heads/master c: 9151b01 h: refs/heads/master v: v3
git-mirror · Nov 13, 2012 · 5658df6 · 5658df6
1 parent 3d34fa6
commit 5658df6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c7c83230c1b0f490fa98402ea666609527d6558
+refs/heads/master: 9151b01f3c5155d67d4dbd1c294694d57859dbec
diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_1516.c b/trunk/drivers/staging/comedi/drivers/addi_apci_1516.c
@@ -169,14 +169,17 @@ static int i_APCI1516_StartStopWriteWatchdog(struct comedi_device *dev,
 	return insn->n;
 }
 
-static int i_APCI1516_ReadWatchdog(struct comedi_device *dev,
+static int apci1516_wdog_insn_read(struct comedi_device *dev,
 				   struct comedi_subdevice *s,
 				   struct comedi_insn *insn,
 				   unsigned int *data)
 {
 	struct apci1516_private *devpriv = dev->private;
+	int i;
+
+	for (i = 0; i < insn->n; i++)
+		data[i] = inw(devpriv->wdog_iobase + APCI1516_WDOG_STATUS_REG);
 
-	data[0] = inw(devpriv->wdog_iobase + APCI1516_WDOG_STATUS_REG) & 0x1;
 	return insn->n;
 }
 
@@ -275,7 +278,7 @@ static int __devinit apci1516_auto_attach(struct comedi_device *dev,
 		s->maxdata	= 0;
 		s->range_table	= &range_digital;
 		s->insn_write	= i_APCI1516_StartStopWriteWatchdog;
-		s->insn_read	= i_APCI1516_ReadWatchdog;
+		s->insn_read	= apci1516_wdog_insn_read;
 		s->insn_config	= i_APCI1516_ConfigWatchdog;
 	} else {
 		s->type		= COMEDI_SUBD_UNUSED;