| From d1ce318496f5943d2cc5e20171fc383a59a1421f Mon Sep 17 00:00:00 2001 |
| From: Ian Abbott <abbotti@mev.co.uk> |
| Date: Wed, 19 Jan 2011 11:48:44 +0000 |
| Subject: staging: comedi: ni_labpc: Use shared IRQ for PCMCIA card |
| |
| From: Ian Abbott <abbotti@mev.co.uk> |
| |
| commit d1ce318496f5943d2cc5e20171fc383a59a1421f upstream. |
| |
| The ni_labpc driver module only requests a shared IRQ for PCI devices, |
| requesting a non-shared IRQ for non-PCI devices. |
| As this module is also used by the ni_labpc_cs module for certain |
| National Instruments PCMCIA cards, it also needs to request a shared IRQ |
| for PCMCIA devices, otherwise you get a IRQ mismatch with the CardBus |
| controller. |
| |
| Signed-off-by: Ian Abbott <abbotti@mev.co.uk> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/staging/comedi/drivers/ni_labpc.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/staging/comedi/drivers/ni_labpc.c |
| +++ b/drivers/staging/comedi/drivers/ni_labpc.c |
| @@ -528,7 +528,8 @@ int labpc_common_attach(struct comedi_de |
| /* grab our IRQ */ |
| if (irq) { |
| isr_flags = 0; |
| - if (thisboard->bustype == pci_bustype) |
| + if (thisboard->bustype == pci_bustype |
| + || thisboard->bustype == pcmcia_bustype) |
| isr_flags |= IRQF_SHARED; |
| if (request_irq(irq, labpc_interrupt, isr_flags, |
| driver_labpc.driver_name, dev)) { |
