fixed data_len issues

diff --git a/comedi/kcomedilib/data.c b/comedi/kcomedilib/data.c
index e9e8addcb4b789e98a2ff6c204a91ae97cac4c36..3ee3603ae56ea8b2516285db0ed18b989d9db274 100644 (file)
--- a/comedi/kcomedilib/data.c
+++ b/comedi/kcomedilib/data.c
@@ -56,6 +56,7 @@ int comedi_data_write(unsigned int dev,unsigned int subdev,unsigned int chan,
        chan = CR_PACK(chan,range,aref);
        cmd.subdev = subdev;
        cmd.data = &sdata;
+       cmd.data_len = sizeof(sampl_t);
 
        cmd.chanlist = &chan;
 
@@ -77,6 +78,7 @@ int comedi_data_read(unsigned int dev,unsigned int subdev,unsigned int chan,
        chan = CR_PACK(chan,range,aref);
        cmd.subdev = subdev;
        cmd.data = &sdata;
+       cmd.data_len = sizeof(sampl_t);
 
        cmd.chanlist = &chan;
 

diff --git a/comedi/kcomedilib/dio.c b/comedi/kcomedilib/dio.c
index 44a2c9350ccaaaa985b8e54fba1e8b2f9fe90310..e1be35f74f85f7316f05b44204bb09e2d65ac63b 100644 (file)
--- a/comedi/kcomedilib/dio.c
+++ b/comedi/kcomedilib/dio.c
@@ -55,6 +55,7 @@ int comedi_dio_config(unsigned int dev,unsigned int subdev,unsigned int chan,
 
        cmd.subdev = subdev;
        cmd.data = &sdata;
+       cmd.data_len = sizeof(sampl_t);
 
        cmd.chanlist = &chan;
 
@@ -74,6 +75,7 @@ int comedi_dio_read(unsigned int dev,unsigned int subdev,unsigned int chan,
        cmd.n = 1;
        cmd.subdev = subdev;
        cmd.data = &sdata;
+       cmd.data_len = sizeof(sampl_t);
        cmd.chanlist = &chan;
 
        ret = comedi_trig_ioctl(dev,subdev,&cmd);
@@ -97,6 +99,7 @@ int comedi_dio_write(unsigned int dev,unsigned int subdev,unsigned int chan,
        cmd.n = 1;
        cmd.subdev = subdev;
        cmd.data = &sdata;
+       cmd.data_len = sizeof(sampl_t);
        cmd.chanlist = &chan;
 
        ret = comedi_trig_ioctl(dev,subdev,&cmd);

diff --git a/comedi/kcomedilib/kcomedilib_main.c b/comedi/kcomedilib/kcomedilib_main.c
index 2559f54987f61a5655f021d34d086c780e29da53..310e88223e8db5af8a2adcc4da94fe06e3ee10e0 100644 (file)
--- a/comedi/kcomedilib/kcomedilib_main.c
+++ b/comedi/kcomedilib/kcomedilib_main.c
@@ -375,7 +375,7 @@ static int comedi_trig_ioctl_modeN(comedi_device *dev,comedi_subdevice *s,comedi
                ret=-EINVAL;
                goto cleanup;
 #else
-               it->data_len=it->n_chan*it->n;
+               it->data_len=it->n_chan*it->n*sizeof(sample_t);
                rt_printk("comedi: warning: trig->data_len not set\n");
 #endif
        }