diff --git a/[refs] b/[refs]
index 874f2bd7a6de..8457c24bf30d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6eafe3665bcc374c66775d58312d1c06c55303f
+refs/heads/master: fed5ea87e02aaf902ff38c65b4514233db03dc09
diff --git a/trunk/drivers/xen/events.c b/trunk/drivers/xen/events.c
index 2f57276e87a2..ce602dd09bc1 100644
--- a/trunk/drivers/xen/events.c
+++ b/trunk/drivers/xen/events.c
@@ -474,6 +474,9 @@ static void unbind_from_irq(unsigned int irq)
 		bind_evtchn_to_cpu(evtchn, 0);
 
 		evtchn_to_irq[evtchn] = -1;
+	}
+
+	if (irq_info[irq].type != IRQT_UNBOUND) {
 		irq_info[irq] = mk_unbound_info();
 
 		dynamic_irq_cleanup(irq);