Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1ce3184 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: ni_labpc: Use shared IRQ for PCMCIA card 



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: default avatarIan Abbott <abbotti@mev.co.uk>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e7bf352f

drivers/staging/comedi/drivers/ni_labpc.c

+2 −1
Original line number Diff line number Diff line
@@ -575,7 +575,8 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase, 
	/* 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)) {