Message ID | 20081021072857.GA333@elte.hu (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
On Tue, 2008-10-21 at 09:28 +0200, Ingo Molnar wrote: > From: Chris Friesen <cfriesen@nortel.com> > Date: Mon, 20 Oct 2008 12:41:58 -0600 > Subject: [PATCH] genirq: fix set_irq_type() when recording trigger type > > In set_irq_type() we want to pass the type rather than the current > interrupt state. > > Signed-off-by: Chris Friesen <cfriesen@nortel.com> > Signed-off-by: Ingo Molnar <mingo@elte.hu> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > --- > kernel/irq/chip.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c > index 4895fde..3de6ea3 100644 > --- a/kernel/irq/chip.c > +++ b/kernel/irq/chip.c > @@ -127,7 +127,7 @@ int set_irq_type(unsigned int irq, unsigned int type) > return 0; > > spin_lock_irqsave(&desc->lock, flags); > - ret = __irq_set_trigger(desc, irq, flags); > + ret = __irq_set_trigger(desc, irq, type); > spin_unlock_irqrestore(&desc->lock, flags); > return ret; > }
* Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote: > On Tue, 2008-10-21 at 09:28 +0200, Ingo Molnar wrote: > > > From: Chris Friesen <cfriesen@nortel.com> > > Date: Mon, 20 Oct 2008 12:41:58 -0600 > > Subject: [PATCH] genirq: fix set_irq_type() when recording trigger type > > > > In set_irq_type() we want to pass the type rather than the current > > interrupt state. > > > > Signed-off-by: Chris Friesen <cfriesen@nortel.com> > > Signed-off-by: Ingo Molnar <mingo@elte.hu> > > Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> thx, added your ack to the commit as well. Ingo
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 4895fde..3de6ea3 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -127,7 +127,7 @@ int set_irq_type(unsigned int irq, unsigned int type) return 0; spin_lock_irqsave(&desc->lock, flags); - ret = __irq_set_trigger(desc, irq, flags); + ret = __irq_set_trigger(desc, irq, type); spin_unlock_irqrestore(&desc->lock, flags); return ret; }