summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2012-06-27 15:04:47 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-06 15:40:06 -0700
commit5c67df8b98316fbfede8d4d6bac64d52d4327357 (patch)
treef71e0b53b69796faa84f6ab3f075dcbe4936096b
parent149b98d1ea4e5d798cd7f954a239ed512c3bf7e5 (diff)
staging: comedi: adl_pci6208: fix the ao_readback variable size
The 'ao_readback' variable in the private data struct is used to cache the last value written to the analog output DAC channels. The PCI-6208 has 8 analog output channels but the variable only allowed space to cache 2 values. Since the PCI-6216 board could be supported by this driver and it has 16 analog outputs, create a define for the maximum number of channels and use that to set the size of 'ao_readback'. For now, set the max to 8 to save space since the PCI-6216 is not currently supported. 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>
-rw-r--r--drivers/staging/comedi/drivers/adl_pci6208.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/adl_pci6208.c b/drivers/staging/comedi/drivers/adl_pci6208.c
index dcaebfc22586..d15f0cbc2e67 100644
--- a/drivers/staging/comedi/drivers/adl_pci6208.c
+++ b/drivers/staging/comedi/drivers/adl_pci6208.c
@@ -56,6 +56,8 @@ References:
#define PCI6208_DIO_DI_MASK (0xf0)
#define PCI6208_DIO_DI_SHIFT (4)
+#define PCI6208_MAX_AO_CHANNELS 8
+
struct pci6208_board {
const char *name;
unsigned short dev_id;
@@ -72,7 +74,7 @@ static const struct pci6208_board pci6208_boards[] = {
struct pci6208_private {
struct pci_dev *pci_dev;
- unsigned int ao_readback[2];
+ unsigned int ao_readback[PCI6208_MAX_AO_CHANNELS];
};
static int pci6208_ao_winsn(struct comedi_device *dev,