2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Ian Abbott <[email protected]> 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 <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Andi Kleen <[email protected]> --- drivers/staging/comedi/drivers/ni_labpc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: linux-2.6.35.y/drivers/staging/comedi/drivers/ni_labpc.c =================================================================== --- linux-2.6.35.y.orig/drivers/staging/comedi/drivers/ni_labpc.c 2011-03-29 22:51:55.939291822 -0700 +++ linux-2.6.35.y/drivers/staging/comedi/drivers/ni_labpc.c 2011-03-29 23:02:58.861329307 -0700 @@ -571,7 +571,8 @@ /* 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)) { _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
