Only the ISA versions of the LabPC boards support DMA and the
devpriv->dma_chan is only set during the ISA board attach if
DMA is available. The extra check of the board->bustype is not
necessary in labpc_ai_cmd().

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
---
 drivers/staging/comedi/drivers/ni_labpc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_labpc.c 
b/drivers/staging/comedi/drivers/ni_labpc.c
index 365149a..5630be3 100644
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@ -893,9 +893,7 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct 
comedi_subdevice *s)
                 * dma unsafe at RT priority,
                 * and too much setup time for TRIG_WAKE_EOS for
                 */
-           (cmd->flags & (TRIG_WAKE_EOS | TRIG_RT)) == 0 &&
-           /*  only available on the isa boards */
-           board->bustype == isa_bustype) {
+           (cmd->flags & (TRIG_WAKE_EOS | TRIG_RT)) == 0) {
                xfer = isa_dma_transfer;
                /* pc-plus has no fifo-half full interrupt */
        } else
-- 
1.8.1.4

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel

Reply via email to