The 'ai_cfg' was already set to PCI9118_AI_CFG_PDTRG | PCI9118_AI_CFG_PETRG. Don't bother setting those bits in pci9118_ai_docmd_dma(). Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx> Cc: Ian Abbott <abbotti@xxxxxxxxx> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/staging/comedi/drivers/adl_pci9118.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c index 5961fef..48064c2 100644 --- a/drivers/staging/comedi/drivers/adl_pci9118.c +++ b/drivers/staging/comedi/drivers/adl_pci9118.c @@ -1145,10 +1145,8 @@ static int pci9118_ai_docmd_dma(struct comedi_device *dev, case 2: devpriv->ai_ctrl |= PCI9118_AI_CTRL_TMRTR | PCI9118_AI_CTRL_DMA; - devpriv->ai_cfg = PCI9118_AI_CFG_PDTRG | - PCI9118_AI_CFG_PETRG | - PCI9118_AI_CFG_BM | - PCI9118_AI_CFG_BS; + devpriv->ai_cfg |= PCI9118_AI_CFG_BM | + PCI9118_AI_CFG_BS; if (cmd->convert_src == TRIG_NOW && !devpriv->softsshdelay) devpriv->ai_cfg |= PCI9118_AI_CFG_BSSH; outl(devpriv->ai_n_realscanlen, @@ -1157,15 +1155,11 @@ static int pci9118_ai_docmd_dma(struct comedi_device *dev, case 3: devpriv->ai_ctrl |= PCI9118_AI_CTRL_EXTM | PCI9118_AI_CTRL_DMA; - devpriv->ai_cfg = PCI9118_AI_CFG_PDTRG | - PCI9118_AI_CFG_PETRG; break; case 4: devpriv->ai_ctrl |= PCI9118_AI_CTRL_TMRTR | PCI9118_AI_CTRL_DMA; - devpriv->ai_cfg = PCI9118_AI_CFG_PDTRG | - PCI9118_AI_CFG_PETRG | - PCI9118_AI_CFG_AM; + devpriv->ai_cfg |= PCI9118_AI_CFG_AM; outl(devpriv->ai_cfg, dev->iobase + PCI9118_AI_CFG_REG); pci9118_timer_set_mode(dev, 0, I8254_MODE0); pci9118_timer_write(dev, 0, dmabuf->hw >> 1); -- 2.0.3 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
