From: Ian Campbell <ian.campbell@citrix.com>
Date: Fri, 18 Feb 2011 16:43:27 +0000 (+0000)
Subject: xen: events: do not leak IRQ from xen_allocate_pirq_msi when no pirq available.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ae1635b05fae30804061406010914d85d12431ac;p=mv-sheeva.git

xen: events: do not leak IRQ from xen_allocate_pirq_msi when no pirq available.

Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: xen-devel@lists.xensource.com
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 89987a7bf26..bce30359007 100644
--- a/drivers/xen/events.c
+++ b/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,