Messages in this thread | | | Date | Sat, 17 Sep 2011 17:24:42 -0600 | From | Grant Likely <> | 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@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> > > 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 > > > >
| |