Change insn->data[] to data[], since insn->data points to user space

diff --git a/comedi/drivers/8255.c b/comedi/drivers/8255.c
index 9fbbec44e247ac6af067d6154ec4c1e47c9494fb..5670367883afe9d00068995351024d78442cb73d 100644 (file)
--- a/comedi/drivers/8255.c
+++ b/comedi/drivers/8255.c
@@ -193,7 +193,7 @@ static int subdev_8255_insn_config(comedi_device *dev,comedi_subdevice *s,
                bits=0xf00000;
        }
 
-       switch(insn->data[0]){
+       switch(data[0]){
        case COMEDI_INPUT:
                s->io_bits&=~bits;
                break;

diff --git a/comedi/drivers/adl_pci9111.c b/comedi/drivers/adl_pci9111.c
index 21b16e6e204f470809a0a272947b5355be636ca9..dffdde950e800e5979426f9d183d2c592ad2ac93 100644 (file)
--- a/comedi/drivers/adl_pci9111.c
+++ b/comedi/drivers/adl_pci9111.c
@@ -1065,7 +1065,7 @@ static int pci9111_ai_insn_read ( comedi_device *dev,
     }
 
     comedi_error(dev,"A/D read timeout");
-    insn->data[i]=0;
+    data[i]=0;
     pci9111_fifo_reset();
     return -ETIME;
 

diff --git a/comedi/drivers/adl_pci9118.c b/comedi/drivers/adl_pci9118.c
index 31be8001ad15207b44abe2d8f02fe2363cebad0d..e87ad89a9fefdce4172323029da7027386062b66 100644 (file)
--- a/comedi/drivers/adl_pci9118.c
+++ b/comedi/drivers/adl_pci9118.c
@@ -362,7 +362,7 @@ static int pci9118_insn_read_ai(comedi_device *dev,comedi_subdevice *s, comedi_i
                }
 
                comedi_error(dev,"A/D insn timeout");
-               insn->data[n]=0;
+               data[n]=0;
                outl(0,dev->iobase+PCI9118_DELFIFO); // flush FIFO
                return -ETIME;
 

diff --git a/comedi/drivers/cb_pcidas64.c b/comedi/drivers/cb_pcidas64.c
index c0503fec754abd5e566688ec07368da41676a127..cf55301931c605deadbc40dac2a5c106d7da6d85 100644 (file)
--- a/comedi/drivers/cb_pcidas64.c
+++ b/comedi/drivers/cb_pcidas64.c
@@ -2627,7 +2627,7 @@ static int dio_60xx_config_insn(comedi_device *dev, comedi_subdevice *s, comedi_
 
        mask = 1 << CR_CHAN(insn->chanspec);
 
-       switch(insn->data[0])
+       switch(data[0])
        {
                case COMEDI_INPUT:
                        s->io_bits &= ~mask;

diff --git a/comedi/drivers/das08.c b/comedi/drivers/das08.c
index 10ab31d41d0f580b47ea7c77e0e97e4bcc583c12..13811ac8148300da4126bc9d5c469b84096426f5 100644 (file)
--- a/comedi/drivers/das08.c
+++ b/comedi/drivers/das08.c
@@ -661,8 +661,8 @@ static int das08jr_ao_winsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *
        int lsb,msb;
        int chan;
 
-       lsb=insn->data[0]&0xff;
-       msb=(insn->data[0]>>8)&0xf;
+       lsb=data[0]&0xff;
+       msb=(data[0]>>8)&0xf;
 
        chan=CR_CHAN(insn->chanspec);
 
@@ -694,8 +694,8 @@ static int das08ao_ao_winsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *
        int lsb,msb;
        int chan;
 
-       lsb=insn->data[0]&0xff;
-       msb=(insn->data[0]>>8)&0xf;
+       lsb=data[0]&0xff;
+       msb=(data[0]>>8)&0xf;
 
        chan=CR_CHAN(insn->chanspec);
 

diff --git a/comedi/drivers/ni_at_ao.c b/comedi/drivers/ni_at_ao.c
index 8f7c021eec137eac3e82108294e514ae14a73d97..8e1f2f8dd71bcfb7a3fa74bacc6e45465c5d559b 100644 (file)
--- a/comedi/drivers/ni_at_ao.c
+++ b/comedi/drivers/ni_at_ao.c
@@ -416,7 +416,7 @@ static int atao_calib_insn_write(comedi_device *dev,comedi_subdevice *s,
        unsigned int bitstring, bit;
        unsigned int chan = CR_CHAN(insn->chanspec);
 
-       bitstring = ((chan&0x7)<<8)|(insn->data[insn->n-1]&0xff);
+       bitstring = ((chan&0x7)<<8)|(data[insn->n-1]&0xff);
 
        for(bit=1<<(11-1);bit;bit>>=1){
                outw(devpriv->cfg2 | ((bit&bitstring)?SDATA:0), dev->iobase + ATAO_CFG2);

diff --git a/comedi/drivers/ni_mio_common.c b/comedi/drivers/ni_mio_common.c
index b657e9ec5c484616953ffe6203c0f107d5dcef81..8c8dc483dbfe97e410e7c0e04a66f97108cc3828 100644 (file)
--- a/comedi/drivers/ni_mio_common.c
+++ b/comedi/drivers/ni_mio_common.c
@@ -3090,7 +3090,7 @@ static int ni_pfi_insn_bits(comedi_device *dev,comedi_subdevice *s,
 {
        if(insn->n!=2)return -EINVAL;
 
-       insn->data[1] = 0;
+       data[1] = 0;
 
        return 2;
 }