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

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

pcmcia: revert "irq probe can be done without risking an IRQ storm" 



This reverts commit 635416ef. The
argument passed to request_irq() only affects action->flags (IRQF_*),
but IRQ_NOAUTOEN relates to desc->status.

Reported-by: default avatarJan Beulich <JBeulich@novell.com>
CC: Alan Cox <alan@linux.intel.com>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 7a96e87d

drivers/pcmcia/pcmcia_resource.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -752,14 +752,6 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req) 




#ifdef CONFIG_PCMCIA_PROBE

#ifdef CONFIG_PCMCIA_PROBE





#ifdef IRQ_NOAUTOEN

	/* if the underlying IRQ infrastructure allows for it, only allocate

	 * the IRQ, but do not enable it

	 */

	if (!(req->Handler))

		type |= IRQ_NOAUTOEN;

#endif /* IRQ_NOAUTOEN */



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

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

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

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

		irq = s->irq.AssignedIRQ;

		irq = s->irq.AssignedIRQ;