aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2007-08-13 23:52:42 -0400
committerPaul Mackerras <paulus@samba.org>2007-08-16 21:02:05 -0400
commit4dc7b4b0405fd7320940849b6e31ea8ea68fd0df (patch)
tree7f906d6a3c69f8b5d39ed88c43eb264ba2faa209
parenta05afe9146f7611d40a58be34ee8442727a6af1f (diff)
[POWERPC] Fix setting of irq trigger type in UIC driver
The UIC (interrupt controller in 4xx embedded CPUs) driver currently missets the IRQ_lEVEL flag in desc->status, due to a thinko. This patch fixes the bug. Currently this is only a cosmetic problem (affects the output in /proc/interrupts), however subsequent patches will use the IRQ_LEVEL flag to affect flow handling. Signed-off-by: Valentine Barshak <vbarshak@ru.mvista.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Acked-by: Josh Boyer <jwboyer@linux.vnet.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/sysdev/uic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/uic.c b/arch/powerpc/sysdev/uic.c
index 89059895a20d..ef8eb5bc6bba 100644
--- a/arch/powerpc/sysdev/uic.c
+++ b/arch/powerpc/sysdev/uic.c
@@ -142,7 +142,7 @@ static int uic_set_irq_type(unsigned int virq, unsigned int flow_type)
142 142
143 desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL); 143 desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);
144 desc->status |= flow_type & IRQ_TYPE_SENSE_MASK; 144 desc->status |= flow_type & IRQ_TYPE_SENSE_MASK;
145 if (trigger) 145 if (!trigger)
146 desc->status |= IRQ_LEVEL; 146 desc->status |= IRQ_LEVEL;
147 147
148 spin_unlock_irqrestore(&uic->lock, flags); 148 spin_unlock_irqrestore(&uic->lock, flags);