[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110917232442.GZ3523@ponder.secretlab.ca>
Date: Sat, 17 Sep 2011 17:24:42 -0600
From: Grant Likely <grant.likely@...retlab.ca>
To: Thomas Gleixner <tglx@...utronix.de>
Cc: Rob Herring <robherring2@...il.com>,
linux-arm-kernel@...ts.infradead.org,
devicetree-discuss@...ts.ozlabs.org, linux-kernel@...r.kernel.org,
marc.zyngier@....com, thomas.abraham@...aro.org,
jamie@...ieiles.com, b-cousson@...com, shawn.guo@...aro.org,
Rob Herring <rob.herring@...xeda.com>
Subject: Re: [PATCH 2/5] irq: fix existing domain check in irq_domain_add
On Wed, Sep 14, 2011 at 06:44:50PM +0200, Thomas Gleixner wrote:
> On Wed, 14 Sep 2011, Rob Herring wrote:
>
> > From: Rob Herring <rob.herring@...xeda.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@...xeda.com>
> > Cc: Grant Likely <grant.likely@...retlab.ca>
> > Cc: Thomas Gleixner <tglx@...utronix.de>
>
> I take this and 1/5 through irq/urgent
Thanks Thomas.
g.
>
> Thanks,
>
> tglx
>
> > ---
> > 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
> >
> >
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists