From 0b7b6347e1980ea0477a76af6b3abe0276901a72 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Thu, 29 Nov 2012 18:19:25 -0700 Subject: [PATCH] --- yaml --- r: 338303 b: refs/heads/master c: 7b5dd1cc988cf34341319c81bb0c7ddc21a2f8ee h: refs/heads/master i: 338301: b2ddfbc0d09c1cdc6bccf71b147a59032d00bca7 338299: 4ae51ee8a06cf825ee616b51db12d8e97ad07a22 338295: cce883f4b20fbf031653a3c7d6b5c27e7b6631d0 338287: a3d22569f25bda0026a3f5f9e97d8bab6cd80801 338271: 95e6f31e4abba469c23b136ccd9cacda707306b6 338239: bae8966eb3b1438d037c37224a60418ab487a5f5 338175: ed0f449cc687ef2cb5e9c243be0b743aea2b91b9 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/addi_apci_2032.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 793b1d3a9767..a2728e0b11fb 100644 --- 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 index b77a84a48c0d..537e02999907 100644 --- 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);