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

Commit d3e03f4e authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: use previously assigned IRQ for all card functions 



Use a previously assigned IRQ for all card functions, not only if
CONFIG_PCMCIA_PROBE is set.

Reported-by: default avatarAlexander Kurz <linux@kbdbabel.org>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 0eddb519

drivers/pcmcia/pcmcia_resource.c

+5 −5
Original line number Diff line number Diff line
@@ -755,12 +755,12 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req) 
	else

		printk(KERN_WARNING "pcmcia: Driver needs updating to support IRQ sharing.\n");



#ifdef CONFIG_PCMCIA_PROBE



	if (s->irq.AssignedIRQ != 0) {

	/* If the interrupt is already assigned, it must be the same */

	if (s->irq.AssignedIRQ != 0)

		irq = s->irq.AssignedIRQ;

	} else {



#ifdef CONFIG_PCMCIA_PROBE

	if (!irq) {

		int try;

		u32 mask = s->irq_mask;

		void *data = p_dev; /* something unique to this device */