1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index 599b116d9747..c0f4eb49177b 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -832,7 +832,8 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
                 }
         }
 #endif
-        if (ret) {
+        /* only assign PCI irq if no IRQ already assigned */
+        if (ret && !s->irq.AssignedIRQ) {
                 if (!s->pci_irq)
                         return ret;
                 irq = s->pci_irq;