diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-03-22 09:55:08 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-25 11:42:59 -0700 |
| commit | 0229979a329e7354adb17d3ccb98bce82d73eb59 (patch) | |
| tree | 3bd172692cbe7e648ec0a6712d822ad750d94cf3 | |
| parent | f06563f0132b21ce4258f977c58f9eb01c90cdd3 (diff) | |
staging: comedi: ni_labpc: allow board to attach without interrupt
If the interrupt is not available this driver will still work
with command support disabled for the analog input subdevice.
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 | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c index 350ba0454bd6..a52647a901f6 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.c +++ b/drivers/staging/comedi/drivers/ni_labpc.c @@ -1661,20 +1661,16 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase, devpriv->write_byte(devpriv->cmd6, dev->iobase + CMD6_REG); } - /* grab our IRQ */ if (irq) { isr_flags = 0; if (board->bustype == pci_bustype || board->bustype == pcmcia_bustype) isr_flags |= IRQF_SHARED; - if (request_irq(irq, labpc_interrupt, isr_flags, - dev->board_name, dev)) { - dev_err(dev->class_dev, "unable to allocate irq %u\n", - irq); - return -EINVAL; - } + ret = request_irq(irq, labpc_interrupt, isr_flags, + dev->board_name, dev); + if (ret == 0) + dev->irq = irq; } - dev->irq = irq; #ifdef CONFIG_ISA_DMA_API /* grab dma channel */ |