Skip to contentSkip to conversation

staging: comedi: adl_pci6208: fix the ao_readback variable size

PATCH In review H Hartley Sweeten 1 participant 1 message Jun 27, 2012 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 15/19 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.

Cc Ian Abbott <[email protected]>
Cc Frank Mori Hess <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
---
 drivers/staging/comedi/drivers/adl_pci6208.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/staging/comedi/drivers/adl_pci6208.c +3 -1
index dcaebfc..d15f0cb 100644
@@ -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,
Signature · 1 line
1.7.11