From: H Hartley Sweeten Date: Fri, 30 Nov 2012 01:19:25 +0000 (-0700) Subject: staging: comedi: addi_apci_2032: fix i_APCI2032_ReadWatchdog() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7b5dd1cc988cf34341319c81bb0c7ddc21a2f8ee;p=linux-beck.git staging: comedi: addi_apci_2032: fix i_APCI2032_ReadWatchdog() This function is used by the watchdog subdevice to read the status of the watchdog. Rename the CamelCase function to apci2032_wdog_insn_read and fix the function to return the status value insn->n times like the comedi core expects. Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/addi_apci_2032.c b/drivers/staging/comedi/drivers/addi_apci_2032.c index b77a84a48c0d..537e02999907 100644 --- a/drivers/staging/comedi/drivers/addi_apci_2032.c +++ b/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);