aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi/drivers/addi_apci_3120.c
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2014-11-04 10:55:12 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-07 09:34:04 -0800
commitecaf4c41da4ace751f71fbb3df611a6167425b6e (patch)
tree9114173d6c9ce3c7a363ad1087b4d373362fdbc1 /drivers/staging/comedi/drivers/addi_apci_3120.c
parentstaging: comedi: addi_apci_3120: don't use timer 2 to count scans (diff)
downloadlinux-dev-ecaf4c41da4ace751f71fbb3df611a6167425b6e.tar.xz
linux-dev-ecaf4c41da4ace751f71fbb3df611a6167425b6e.zip
staging: comedi: addi_apci_3120: define the AI FIFO register
Define the offset for the analog input FIFO register. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/addi_apci_3120.c')
-rw-r--r--drivers/staging/comedi/drivers/addi_apci_3120.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index eec0cdba1206..322640ee91b5 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -16,6 +16,7 @@
/*
* PCI BAR 1 register map (dev->iobase)
*/
+#define APCI3120_AI_FIFO_REG 0x00
#define APCI3120_CTRL_REG 0x00
#define APCI3120_CTRL_EXT_TRIG (1 << 15)
#define APCI3120_CTRL_GATE(x) (1 << (12 + (x)))
@@ -370,7 +371,7 @@ static int apci3120_ai_insn_read(struct comedi_device *dev,
if (ret)
return ret;
- data[i] = inw(dev->iobase + 0);
+ data[i] = inw(dev->iobase + APCI3120_AI_FIFO_REG);
}
return insn->n;