openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: das1800: initialize all analog outputs 

The current code used to initialize the analog outputs only sets the
last channel. The other channels will be reloaded with the last value
that was written to them.

Move the code into the subdevice init and properly initialize all the
channels to 0V.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2016-04-08 12:41:40 -07:00 committed by Greg Kroah-Hartman
parent bc524200ed
commit 605b670e9b
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/comedi/drivers/das1800.c
View File

@ -1262,6 +1262,7 @@ static int das1800_attach(struct comedi_device *dev,
unsigned int irq = it->options[1];
bool is_16bit;
int ret;
int i;
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
@ -1365,6 +1366,12 @@ static int das1800_attach(struct comedi_device *dev,
s->maxdata = is_16bit ? 0xffff : 0x0fff;
s->range_table = &range_bipolar10;
s->insn_write = das1800_ao_insn_write;
/* initialize all channels to 0V */
for (i = 0; i < s->n_chan; i++) {
outb(DAC(i), dev->iobase + DAS1800_SELECT);
outw(0, dev->iobase + DAS1800_DAC);
}
} else {
s->type = COMEDI_SUBD_UNUSED;
}
@ -1392,14 +1399,6 @@ static int das1800_attach(struct comedi_device *dev,
/* initialize digital out channels */
outb(0, dev->iobase + DAS1800_DIGITAL);
/* initialize analog out channels */
if (board->ao_ability == 1) {
/* select 'update' dac channel for baseAddress + 0x0 */
outb(DAC(board->ao_n_chan - 1),
dev->iobase + DAS1800_SELECT);
outw(devpriv->ao_update_bits, dev->iobase + DAS1800_DAC);
}
return 0;
};