diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-04-22 12:33:30 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-23 10:36:28 -0700 |
| commit | 767308842b4b970ca105b1e80cd92af39355dfc5 (patch) | |
| tree | 15314fc5087e81a9330874cd04d1f849ddfd4f81 /drivers/staging/comedi/drivers/ni_labpc_pci.c | |
| parent | fa3cb2191091657038ddb9207888b6cfb11fdf6e (diff) | |
staging: comedi: ni_labpc: move DMA init out of the common attach
Only the ISA versions of the LabPC boards support DMA. Move the DMA
initialization out of the labpc_common_attach() and put it in the
ISA specific labpc_attach() function.
Remove the 'dma_chan' parameter from labpc_common_attach().
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>
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_labpc_pci.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_labpc_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc_pci.c b/drivers/staging/comedi/drivers/ni_labpc_pci.c index 82e381fe34ee..13ae267f1824 100644 --- a/drivers/staging/comedi/drivers/ni_labpc_pci.c +++ b/drivers/staging/comedi/drivers/ni_labpc_pci.c @@ -92,7 +92,7 @@ static int labpc_pci_auto_attach(struct comedi_device *dev, return ret; dev->iobase = (unsigned long)devpriv->mite->daq_io_addr; - return labpc_common_attach(dev, mite_irq(devpriv->mite), 0); + return labpc_common_attach(dev, mite_irq(devpriv->mite)); } static void labpc_pci_detach(struct comedi_device *dev) |