Merge redhat.com:/spare/repo/linux-2.5

into redhat.com:/spare/repo/libata-2.5

Merge redhat.com:/spare/repo/linux-2.5
into redhat.com:/spare/repo/libata-2.5
97abf946 · Jeff Garzik · 3a357594 · 164cf89e · 97abf946
Commit 97abf946 authored Oct 23, 2003 by Jeff Garzik
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

arch/i386/kernel/irq.c arch/i386/kernel/irq.c +1 -1

No files found.
--- a/arch/i386/kernel/irq.c
+++ b/arch/i386/kernel/irq.c
@@ -380,7 +380,7 @@ void enable_irq(unsigned int irq)
 	spin_lock_irqsave(&desc->lock, flags);
 	switch (desc->depth) {
 	case 1: {
-		unsigned int status = desc->status & ~(IRQ_DISABLED | IRQ_INPROGRESS);
+		unsigned int status = desc->status & ~IRQ_DISABLED;
 		desc->status = status;
 		if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
 			desc->status = status | IRQ_REPLAY;