From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Fri, 18 Sep 2009 23:55:29 +0000 (-0700)
Subject: xen/evtchn: ports start enabled
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=0edce91dcd83160019867a00746c679344dc0bbd;p=openwrt%2Fstaging%2Fblogic.git

xen/evtchn: ports start enabled

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
---

diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c
index 709c32d949bf..72dc7f20c5ed 100644
--- a/drivers/xen/evtchn.c
+++ b/drivers/xen/evtchn.c
@@ -108,10 +108,9 @@ irqreturn_t evtchn_interrupt(int irq, void *data)
 
 	u = get_port_user(port);
 
-	if (WARN(!get_port_enabled(port),
-		 "Interrupt for port %d, but apparently not enabled; per-user %p\n",
-		 port, u))
-		goto out;
+	WARN(!get_port_enabled(port),
+	     "Interrupt for port %d, but apparently not enabled; per-user %p\n",
+	     port, u);
 
 	disable_irq_nosync(irq);
 	set_port_enabled(port, false);
@@ -127,7 +126,6 @@ irqreturn_t evtchn_interrupt(int irq, void *data)
 	} else
 		u->ring_overflow = 1;
 
-out:
 	spin_unlock(&port_user_lock);
 
 	return IRQ_HANDLED;
@@ -265,6 +263,7 @@ static int evtchn_bind_to_user(struct per_user_data *u, int port)
 	 */
 	BUG_ON(get_port_user(port) != NULL);
 	set_port_user(port, u);
+	set_port_enabled(port, true); /* start enabled */
 
 	rc = bind_evtchn_to_irqhandler(port, evtchn_interrupt, IRQF_DISABLED,
 				       u->name, (void *)(unsigned long)port);