diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-03-22 09:55:54 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-25 11:43:01 -0700 |
| commit | 290899082a4214b16537be64a6b7e3882bb5aeb1 (patch) | |
| tree | e02f298aef44a002ee7530496bc3a6658d3ccb90 | |
| parent | 19a40abf5ee320e8f0874116989773b7c071aa08 (diff) | |
staging: comedi: ni_labpc: dma requires an interrupt
DMA support only works if an interrupt is available.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_labpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c index 744db1f5aa25..926c4f12d04c 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.c +++ b/drivers/staging/comedi/drivers/ni_labpc.c @@ -1673,7 +1673,7 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase, } #ifdef CONFIG_ISA_DMA_API - if (dma_chan == 1 || dma_chan == 3) { + if (dev->irq && (dma_chan == 1 || dma_chan == 3)) { devpriv->dma_buffer = kmalloc(dma_buffer_size, GFP_KERNEL | GFP_DMA); if (devpriv->dma_buffer) { |