---

yaml --- r: 8157 b: refs/heads/master c: c181e0e h: refs/heads/master i: 8155: ca502e5 v: v3
git-mirror · Sep 9, 2005 · 20eae4e · 20eae4e
1 parent 3f1ccd6
commit 20eae4e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;