---

yaml --- r: 264209 b: refs/heads/master c: eef24af h: refs/heads/master i: 264207: 4dd2158 v: v3
git-mirror · Sep 20, 2011 · b0f3811 · b0f3811
1 parent 2310c9d
commit b0f3811
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5bd078dda4d4fbdb4bd138a6bd5b6e274c019ed2
+refs/heads/master: eef24afb28561a5a9f4be8f8da97735b7e6a826f
diff --git a/trunk/kernel/irq/irqdomain.c b/trunk/kernel/irq/irqdomain.c
@@ -29,7 +29,11 @@ void irq_domain_add(struct irq_domain *domain)
 	 */
 	for (hwirq = 0; hwirq < domain->nr_irq; hwirq++) {
 		d = irq_get_irq_data(irq_domain_to_irq(domain, hwirq));
-		if (d || d->domain) {
+		if (!d) {
+			WARN(1, "error: assigning domain to non existant irq_desc");
+			return;
+		}
+		if (d->domain) {
 			/* things are broken; just report, don't clean up */
 			WARN(1, "error: irq_desc already assigned to a domain");
 			return;