Skip to content

Commit

Permalink
staging: comedi: addi_apci_1516: fix i_APCI1516_ReadWatchdog()
Browse files Browse the repository at this point in the history
This function is used by the watchdog subdevice to read the status of
the watchdog. Rename the CamelCase function to apci1516_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 <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Nov 13, 2012
1 parent 5c7c832 commit 9151b01
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions drivers/staging/comedi/drivers/addi_apci_1516.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 9151b01

Please sign in to comment.