From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Mon, 26 May 2008 22:31:24 +0000 (+0100)
Subject: xen: fix unbind_from_irq()
X-Git-Tag: firefly_0821_release~19697^2~253^24~21
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0f2287ad7c61f10b2a22a06e2a66cdbbbfc44ad0;p=firefly-linux-kernel-4.4.55.git

xen: fix unbind_from_irq()

Rearrange the tests in unbind_from_irq() so that we can still unbind
an irq even if the underlying event channel is bad.  This allows a
device driver to shuffle its irqs on save/restore before the
underlying event channels have been fixed up.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index f64e9798129c..70375a690761 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -355,7 +355,7 @@ static void unbind_from_irq(unsigned int irq)
 
 	spin_lock(&irq_mapping_update_lock);
 
-	if (VALID_EVTCHN(evtchn) && (--irq_bindcount[irq] == 0)) {
+	if ((--irq_bindcount[irq] == 0) && VALID_EVTCHN(evtchn)) {
 		close.port = evtchn;
 		if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close) != 0)
 			BUG();
@@ -375,7 +375,7 @@ static void unbind_from_irq(unsigned int irq)
 		evtchn_to_irq[evtchn] = -1;
 		irq_info[irq] = IRQ_UNBOUND;
 
-		dynamic_irq_init(irq);
+		dynamic_irq_cleanup(irq);
 	}
 
 	spin_unlock(&irq_mapping_update_lock);