Commit 7b5dd1cc authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7180eb30
...@@ -156,12 +156,16 @@ static int i_APCI2032_StartStopWriteWatchdog(struct comedi_device *dev, ...@@ -156,12 +156,16 @@ static int i_APCI2032_StartStopWriteWatchdog(struct comedi_device *dev,
return insn->n; 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_subdevice *s,
struct comedi_insn *insn, struct comedi_insn *insn,
unsigned int *data) 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; return insn->n;
} }
...@@ -268,7 +272,7 @@ static int apci2032_auto_attach(struct comedi_device *dev, ...@@ -268,7 +272,7 @@ static int apci2032_auto_attach(struct comedi_device *dev,
s->len_chanlist = 1; s->len_chanlist = 1;
s->range_table = &range_digital; s->range_table = &range_digital;
s->insn_write = i_APCI2032_StartStopWriteWatchdog; 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; s->insn_config = i_APCI2032_ConfigWatchdog;
apci2032_reset(dev); apci2032_reset(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment