devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Rob Herring <robherring2@gmail.com>
To: linux-arm-kernel@lists.infradead.org,
	devicetree-discuss@lists.ozlabs.org,
	linux-kernel@vger.kernel.org
Cc: grant.likely@secretlab.ca, marc.zyngier@arm.com,
	thomas.abraham@linaro.org, jamie@jamieiles.com, b-cousson@ti.com,
	shawn.guo@linaro.org, Rob Herring <rob.herring@calxeda.com>,
	Thomas Gleixner <tglx@linutronix.de>
Subject: [PATCH 2/5] irq: fix existing domain check in irq_domain_add
Date: Wed, 14 Sep 2011 11:31:37 -0500	[thread overview]
Message-ID: <1316017900-19918-3-git-send-email-robherring2@gmail.com> (raw)
In-Reply-To: <1316017900-19918-1-git-send-email-robherring2@gmail.com>

From: Rob Herring <rob.herring@calxeda.com>

irq_data will normally exist, so the domain was prevented from being set.
The simple domain code did not hit this as nr_irq is always 0.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Thomas Gleixner <tglx@linutronix.de>
---
 kernel/irq/irqdomain.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index d5828da..84f4110 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -29,7 +29,7 @@ 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 && d->domain) {
 			/* things are broken; just report, don't clean up */
 			WARN(1, "error: irq_desc already assigned to a domain");
 			return;
-- 
1.7.5.4

  reply	other threads:[~2011-09-14 16:31 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-14 16:31 [PATCH 0/5] GIC OF bindings Rob Herring
2011-09-14 16:31 ` Rob Herring [this message]
     [not found]   ` <1316017900-19918-3-git-send-email-robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-14 16:44     ` [PATCH 2/5] irq: fix existing domain check in irq_domain_add Thomas Gleixner
2011-09-17 23:24       ` Grant Likely
     [not found] ` <1316017900-19918-1-git-send-email-robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-14 16:31   ` [PATCH 1/5] irq: add declaration of irq_domain_simple_ops to irqdomain.h Rob Herring
2011-09-14 16:31   ` [PATCH 3/5] of/irq: introduce of_irq_init Rob Herring
     [not found]     ` <1316017900-19918-4-git-send-email-robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-15 10:41       ` Arnd Bergmann
2011-09-17 23:53       ` Grant Likely
     [not found]         ` <20110917235328.GA3523-e0URQFbLeQY2iJbIjFUEsiwD8/FfD2ys@public.gmane.org>
2011-09-18  1:37           ` Rob Herring
     [not found]             ` <4E754B56.1010404-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-18  6:02               ` Grant Likely
2011-09-14 16:31   ` [PATCH 5/5] ARM: gic: add OF based initialization Rob Herring
2011-09-14 17:46     ` Marc Zyngier
     [not found]       ` <4E70E88E.4090503-5wv7dgnIgG8@public.gmane.org>
2011-09-14 17:57         ` Rob Herring
2011-09-14 18:34           ` Marc Zyngier
     [not found]             ` <4E70F3C9.2010202-5wv7dgnIgG8@public.gmane.org>
2011-09-14 18:51               ` Rob Herring
     [not found]                 ` <4E70F7BE.6020909-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-18  0:13                   ` Grant Likely
2011-09-15  7:55     ` Thomas Abraham
     [not found]       ` <CAJuYYwSFu2HC+u2NY41+yw9tEyy85RKa4Dpm3SL+jbwS_OOA0A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-09-15 10:07         ` Cousson, Benoit
     [not found]           ` <4E71CE5D.9030900-l0cyMroinI0@public.gmane.org>
2011-09-15 10:29             ` Russell King - ARM Linux
     [not found]               ` <20110915102915.GJ6267-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2011-09-15 12:28                 ` Cousson, Benoit
     [not found]                   ` <4E71EF56.3050503-l0cyMroinI0@public.gmane.org>
2011-09-15 12:51                     ` Russell King - ARM Linux
     [not found]                       ` <20110915125107.GK6267-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2011-09-15 13:03                         ` Cousson, Benoit
2011-09-15 13:11             ` Rob Herring
     [not found]               ` <4E71F978.6020402-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-15 13:52                 ` Cousson, Benoit
2011-09-15 16:43                   ` Rob Herring
2011-09-18 21:23                     ` Rob Herring
     [not found]                       ` <4E76615C.3000005-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-19 12:09                         ` Cousson, Benoit
     [not found]                           ` <4E77310A.3000106-l0cyMroinI0@public.gmane.org>
2011-09-19 13:48                             ` Rob Herring
     [not found]                               ` <4E774847.3020104-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-19 14:32                                 ` Cousson, Benoit
2011-09-19 21:14                               ` Grant Likely
     [not found]                                 ` <CACxGe6v9nd5f5x-eu9hUyAqdS1+p3h6ixyutECYLdNo3ewDH0w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-09-19 21:53                                   ` Rob Herring
     [not found]                                     ` <4E77B9E3.40004-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-20  0:22                                       ` Grant Likely
2011-09-20  4:18                                       ` Grant Likely
2011-09-20 15:23                                       ` Cousson, Benoit
2011-09-19 16:00                             ` Russell King - ARM Linux
2011-09-19 20:49                         ` Grant Likely
     [not found]                     ` <4E722B2D.4050307-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-19  9:47                       ` Cousson, Benoit
     [not found]                         ` <4E770FA6.2070305-l0cyMroinI0@public.gmane.org>
2011-09-19 13:33                           ` Russell King - ARM Linux
     [not found]                             ` <20110919133301.GR16381-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2011-09-19 17:44                               ` Grant Likely
2011-09-18  6:15             ` Grant Likely
     [not found]               ` <20110918061526.GE3523-e0URQFbLeQY2iJbIjFUEsiwD8/FfD2ys@public.gmane.org>
2011-09-19  8:47                 ` Cousson, Benoit
2011-09-16 16:09           ` Dave Martin
     [not found]             ` <20110916160939.GA2100-5wv7dgnIgG8@public.gmane.org>
2011-09-18  6:21               ` Grant Likely
2011-09-19 12:07                 ` Dave Martin
2011-09-19 13:08                   ` Cousson, Benoit
2011-09-15 12:54         ` Rob Herring
     [not found]           ` <4E71F593.2040903-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-16  9:34             ` Thomas Abraham
     [not found]               ` <CAJuYYwQ=tSh8k5ZOi2kx6KbMsQ4eVAvgE=T4kdckRSLjdj3dMQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-09-18  6:10                 ` Grant Likely
     [not found]                   ` <20110918061024.GD3523-e0URQFbLeQY2iJbIjFUEsiwD8/FfD2ys@public.gmane.org>
2011-09-19 12:59                     ` Thomas Abraham
     [not found]     ` <1316017900-19918-6-git-send-email-robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-15 10:43       ` Arnd Bergmann
2011-09-18  6:30       ` Grant Likely
2011-09-14 16:31 ` [PATCH 4/5] ARM: gic: allow irq_start to be 0 Rob Herring
     [not found]   ` <1316017900-19918-5-git-send-email-robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-18  6:24     ` Grant Likely
2011-09-18 12:03     ` Russell King - ARM Linux
2011-09-15  8:50 ` [PATCH 0/5] GIC OF bindings Jamie Iles
2011-09-15 13:53 ` Shawn Guo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1316017900-19918-3-git-send-email-robherring2@gmail.com \
    --to=robherring2@gmail.com \
    --cc=b-cousson@ti.com \
    --cc=devicetree-discuss@lists.ozlabs.org \
    --cc=grant.likely@secretlab.ca \
    --cc=jamie@jamieiles.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marc.zyngier@arm.com \
    --cc=rob.herring@calxeda.com \
    --cc=shawn.guo@linaro.org \
    --cc=tglx@linutronix.de \
    --cc=thomas.abraham@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).