From: H Hartley Sweeten Date: Mon, 25 Aug 2014 23:04:28 +0000 (-0700) Subject: staging: comedi: me_daq: fix bug in me_ao_insn_write() X-Git-Tag: v3.18-rc1~130^2~1024 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=61e9332b1cf748673d6fe4217fa21730330a29d1;p=karo-tx-linux.git staging: comedi: me_daq: fix bug in me_ao_insn_write() The comedi core expects (*insn_write) functions to write insn->n values to the hardware and return the number of values written. Currently, this function only writes the first value. The core also validates all the data values so the extra masking with s->maxdata is not needed. Fix this function to work like the core expects. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c index 37a6fa92c656..df1fceb3c53f 100644 --- a/drivers/staging/comedi/drivers/me_daq.c +++ b/drivers/staging/comedi/drivers/me_daq.c @@ -325,6 +325,7 @@ static int me_ao_insn_write(struct comedi_device *dev, struct me_private_data *dev_private = dev->private; unsigned int chan = CR_CHAN(insn->chanspec); unsigned int rang = CR_RANGE(insn->chanspec); + unsigned int val = dev_private->ao_readback[chan]; int i; /* Enable all DAC */ @@ -353,10 +354,11 @@ static int me_ao_insn_write(struct comedi_device *dev, /* Set data register */ for (i = 0; i < insn->n; i++) { - writew((data[0] & s->maxdata), - dev->mmio + ME_DAC_DATA_A + (chan << 1)); - dev_private->ao_readback[chan] = (data[0] & s->maxdata); + val = data[i]; + + writew(val, dev->mmio + ME_DAC_DATA_A + (chan << 1)); } + dev_private->ao_readback[chan] = val; /* Update dac with data registers */ readw(dev->mmio + ME_DAC_UPDATE);