From adddb4163cf749bad6bd9e368b0d097bc0566915 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 16 Jun 2008 14:35:15 +0200 Subject: [PATCH] --- yaml --- r: 98932 b: refs/heads/master c: 635416ef393e8cec5a89fc6c1de710ee9596a51e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pcmcia/pcmcia_resource.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5d64c73f8639..536305b17c96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05f43d48ddbda0ce74941aff4711a1829116cc4f +refs/heads/master: 635416ef393e8cec5a89fc6c1de710ee9596a51e diff --git a/trunk/drivers/pcmcia/pcmcia_resource.c b/trunk/drivers/pcmcia/pcmcia_resource.c index c8f77b889d42..78af59415930 100644 --- a/trunk/drivers/pcmcia/pcmcia_resource.c +++ b/trunk/drivers/pcmcia/pcmcia_resource.c @@ -812,6 +812,15 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req) type = IRQF_SHARED; #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->Attributes & IRQ_HANDLE_PRESENT)) + 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;