From f236e7581f574f639b79ff77d08b078f764b67e0 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Fri, 18 Feb 2011 16:43:27 +0000
Subject: [PATCH] --- yaml --- r: 234200 b: refs/heads/master c:
 ae1635b05fae30804061406010914d85d12431ac h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/xen/events.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8fa4cfd2a611..65147eaa6b36 100644
--- 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
index 89987a7bf26f..bce303590075 100644
--- 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,