diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-03-09 17:17:36 +0100 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-03-15 14:50:14 +0100 |
| commit | b416cd8efb6ce2661f8f98f603972f0b8f796ee4 (patch) | |
| tree | b763114b7962ab08012a831b5bc2aa901860be2b /drivers/pcmcia | |
| parent | 7a96e87d6e58a07235a2bc3eff9b093af4937a72 (diff) | |
| download | linux-3.10-b416cd8efb6ce2661f8f98f603972f0b8f796ee4.tar.gz linux-3.10-b416cd8efb6ce2661f8f98f603972f0b8f796ee4.tar.bz2 linux-3.10-b416cd8efb6ce2661f8f98f603972f0b8f796ee4.zip | |
pcmcia: revert "irq probe can be done without risking an IRQ storm"
This reverts commit 635416ef393e8cec5a89fc6c1de710ee9596a51e. The
argument passed to request_irq() only affects action->flags (IRQF_*),
but IRQ_NOAUTOEN relates to desc->status.
Reported-by: Jan Beulich <JBeulich@novell.com>
CC: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/pcmcia_resource.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c index b2df04199a2..ef782c09f02 100644 --- a/drivers/pcmcia/pcmcia_resource.c +++ b/drivers/pcmcia/pcmcia_resource.c @@ -752,14 +752,6 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req) #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 the interrupt is already assigned, it must be the same */ irq = s->irq.AssignedIRQ; |