diff options
author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-04-22 12:33:53 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-23 10:36:28 -0700 |
commit | 3e034797191de9981cddff4d1a8203d020360958 (patch) | |
tree | ca7f375862f77ac452bbbc367ddbaa5aea031f85 /drivers/staging/comedi/drivers/ni_labpc_pci.c | |
parent | 767308842b4b970ca105b1e80cd92af39355dfc5 (diff) |
staging: comedi: ni_labpc: pass the isr_flags to labpc_common_attach()
The PCI and PCMCIA LabPC boards use shared interrupts and need the
IRQF_SHARED flag set when requesting the irq, the ISA boards do not.
Instead of checking the 'bustype' in labpc_common_attach() in order
to determine the isr_flags, just pass the flags as a parameter to the
function.
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 13ae267f1824..4beadfeabf87 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)); + return labpc_common_attach(dev, mite_irq(devpriv->mite), IRQF_SHARED); } static void labpc_pci_detach(struct comedi_device *dev) |