---

yaml --- r: 338303 b: refs/heads/master c: 7b5dd1c h: refs/heads/master i: 338301: b2ddfbc 338299: 4ae51ee 338295: cce883f 338287: a3d2256 338271: 95e6f31 338239: bae8966 338175: ed0f449 v: v3
git-mirror · Nov 30, 2012 · 0b7b634 · 0b7b634
1 parent fe059f4
commit 0b7b634
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7180eb30deee6c05b8924348a7ac7d4deefcf56e
+refs/heads/master: 7b5dd1cc988cf34341319c81bb0c7ddc21a2f8ee
diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_2032.c b/trunk/drivers/staging/comedi/drivers/addi_apci_2032.c
@@ -156,12 +156,16 @@ static int i_APCI2032_StartStopWriteWatchdog(struct comedi_device *dev,
 	return insn->n;
 }
 
-static int i_APCI2032_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)
 {
-	data[0] = inl(dev->iobase + APCI2032_WDOG_STATUS_REG) & 0x1;
+	int i;
+
+	for (i = 0; i < insn->n; i++)
+		data[i] = inl(dev->iobase + APCI2032_WDOG_STATUS_REG);
+
 	return insn->n;
 }
 
@@ -268,7 +272,7 @@ static int apci2032_auto_attach(struct comedi_device *dev,
 	s->len_chanlist = 1;
 	s->range_table = &range_digital;
 	s->insn_write = i_APCI2032_StartStopWriteWatchdog;
-	s->insn_read = i_APCI2032_ReadWatchdog;
+	s->insn_read = apci1516_wdog_insn_read;
 	s->insn_config = i_APCI2032_ConfigWatchdog;
 
 	apci2032_reset(dev);