---

yaml --- r: 234200 b: refs/heads/master c: ae1635b h: refs/heads/master v: v3
git-mirror · Mar 10, 2011 · f236e75 · f236e75
1 parent fa2dd8f
commit f236e75
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 260a7d4cfd26d8bad8ac3a7fce11de47491d7e00
+refs/heads/master: ae1635b05fae30804061406010914d85d12431ac
diff --git a/trunk/drivers/xen/events.c b/trunk/drivers/xen/events.c
@@ -676,8 +676,11 @@ void xen_allocate_pirq_msi(char *name, int *irq, int *pirq, int alloc)
 
 	if (alloc & XEN_ALLOC_PIRQ) {
 		*pirq = find_unbound_pirq(MAP_PIRQ_TYPE_MSI);
-		if (*pirq == -1)
+		if (*pirq == -1) {
+			xen_free_irq(*irq);
+			*irq = -1;
 			goto out;
+		}
 	}
 
 	set_irq_chip_and_handler_name(*irq, &xen_pirq_chip,