---

yaml --- r: 123260 b: refs/heads/master c: 6f8a0ed h: refs/heads/master v: v3
git-mirror · Dec 18, 2008 · f0ad570 · f0ad570
1 parent 64048f2
commit f0ad570
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17483a1f34c970e6c2cb8c082d4441bfabbe88a9
+refs/heads/master: 6f8a0ed4e5d86c01db5e7e3f95d9003b7cf9cb87
diff --git a/trunk/drivers/xen/events.c b/trunk/drivers/xen/events.c
@@ -233,6 +233,7 @@ static void unmask_evtchn(int port)
 static int find_unbound_irq(void)
 {
 	int irq;
+	struct irq_desc *desc;
 
 	/* Only allocate from dynirq range */
 	for (irq = 0; irq < nr_irqs; irq++)
@@ -242,6 +243,10 @@ static int find_unbound_irq(void)
 	if (irq == nr_irqs)
 		panic("No available IRQ to bind to: increase nr_irqs!\n");
 
+	desc = irq_to_desc_alloc_cpu(irq, 0);
+	if (WARN_ON(desc == NULL))
+		return -1;
+
 	return irq;
 }