diff --git a/[refs] b/[refs]
index 5f4f974d75a9..fb2c2c41cb2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc550e95921e109f3778a6b2dc560d63388810ab
+refs/heads/master: 110e7c7e4f8a61a34e0ab88fc9bdf4d5c6d220b2
diff --git a/trunk/drivers/xen/events.c b/trunk/drivers/xen/events.c
index 4d4a23d4c9f6..3df7e477694a 100644
--- a/trunk/drivers/xen/events.c
+++ b/trunk/drivers/xen/events.c
@@ -170,6 +170,9 @@ static struct irq_info *info_for_irq(unsigned irq)
 
 static unsigned int evtchn_from_irq(unsigned irq)
 {
+	if (unlikely(WARN(irq < 0 || irq >= nr_irqs, "Invalid irq %d!\n", irq)))
+		return 0;
+
 	return info_for_irq(irq)->evtchn;
 }