Bug fix from Edwin Steiner <edwin.steiner@gmx.net>:

The problem is that in ni_m_series_load_channelgain_list config_bits
is not reset to 0 in the loop over the channels.

diff --git a/Contributors b/Contributors
index d921923c91512f2c461ac069ac3f655046ee67c6..3c9d0a3574e1845280b6a7a1870d009703fa61e7 100644 (file)
--- a/Contributors
+++ b/Contributors
@@ -46,6 +46,7 @@ Robert Schwebel <robert@schwebel.de>
 Steve D Sharples <steve.sharples@nottingham.ac.uk>
 Joe Smith <jes@presto.med.upenn.edu>
 Anne Smorthit <anne.smorthit@sfwte.ch>
+Edwin Steiner <edwin.steiner@gmx.net>
 Oystein Svendsen <svendsen@pvv.org>
 Caleb Tennis <caleb@aei-tech.com>
 Salvador Eduardo Tropea <salvador@inti.gov.ar>

diff --git a/comedi/drivers/ni_mio_common.c b/comedi/drivers/ni_mio_common.c
index c928f1c1242016d4862361ea383062d26205bfdd..d69d88b5d093f15d5001badac75ee8997a33dc52 100644 (file)
--- a/comedi/drivers/ni_mio_common.c
+++ b/comedi/drivers/ni_mio_common.c
@@ -1440,7 +1440,6 @@ static void ni_m_series_load_channelgain_list(comedi_device *dev,unsigned int n_
 {
        unsigned int chan, range, aref;
        unsigned int i;
-       unsigned config_bits = 0;
        unsigned offset;
        unsigned int dither;
        unsigned range_code;
@@ -1473,6 +1472,7 @@ static void ni_m_series_load_channelgain_list(comedi_device *dev,unsigned int n_
        offset = 0;
        for(i = 0; i < n_chan; i++)
        {
+               unsigned config_bits = 0;
                chan = CR_CHAN(list[i]);
                aref = CR_AREF(list[i]);
                range = CR_RANGE(list[i]);
@@ -1480,7 +1480,6 @@ static void ni_m_series_load_channelgain_list(comedi_device *dev,unsigned int n_
 
                range_code = ni_gainlkup[boardtype.gainlkup][range];
                devpriv->ai_offset[i] = offset;
-
                switch( aref )
                {
                        case AREF_DIFF: