diff --git a/[refs] b/[refs]
index 577c5cd44213..030adf4b2b87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18283ea7433c703d3fcce33d189b637a7aaf0a49
+refs/heads/master: e7e44e444876478d50630f57b0c31d29f6725020
diff --git a/trunk/drivers/xen/evtchn.c b/trunk/drivers/xen/evtchn.c
index 4ebd501f1f80..45c8efaa6b3e 100644
--- a/trunk/drivers/xen/evtchn.c
+++ b/trunk/drivers/xen/evtchn.c
@@ -269,6 +269,14 @@ static int evtchn_bind_to_user(struct per_user_data *u, int port)
 				       u->name, (void *)(unsigned long)port);
 	if (rc >= 0)
 		rc = evtchn_make_refcounted(port);
+	else {
+		/* bind failed, should close the port now */
+		struct evtchn_close close;
+		close.port = port;
+		if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close) != 0)
+			BUG();
+		set_port_user(port, NULL);
+	}
 
 	return rc;
 }
@@ -277,6 +285,8 @@ static void evtchn_unbind_from_user(struct per_user_data *u, int port)
 {
 	int irq = irq_from_evtchn(port);
 
+	BUG_ON(irq < 0);
+
 	unbind_from_irqhandler(irq, (void *)(unsigned long)port);
 
 	set_port_user(port, NULL);