From 20eae4e3b202583c020cb69910c4cefb5cc1b847 Mon Sep 17 00:00:00 2001
From: Daniel Ritz <daniel.ritz@gmx.ch>
Date: Fri, 9 Sep 2005 13:03:25 -0700
Subject: [PATCH] --- yaml --- r: 8157 b: refs/heads/master c:
 c181e0e00ff778623c7fda055fd404a06d2c7845 h: refs/heads/master i:   8155:
 ca502e54ed96dc66aa0f92a5a1bd134f0249905d v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/pcmcia/pcmcia_resource.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 254415cbc152..8a737d41130d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf4de6f2db79f3c396bd884f546cd2ea91a686f2
+refs/heads/master: c181e0e00ff778623c7fda055fd404a06d2c7845
diff --git a/trunk/drivers/pcmcia/pcmcia_resource.c b/trunk/drivers/pcmcia/pcmcia_resource.c
index 599b116d9747..c0f4eb49177b 100644
--- a/trunk/drivers/pcmcia/pcmcia_resource.c
+++ b/trunk/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;