diff options
Diffstat (limited to 'kernel/irq/spurious.c')
-rw-r--r-- | kernel/irq/spurious.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c index 89fb90ae534f..36c2c9289e2b 100644 --- a/kernel/irq/spurious.c +++ b/kernel/irq/spurious.c | |||
@@ -78,8 +78,8 @@ static int try_one_irq(int irq, struct irq_desc *desc) | |||
78 | * If we did actual work for the real IRQ line we must let the | 78 | * If we did actual work for the real IRQ line we must let the |
79 | * IRQ controller clean up too | 79 | * IRQ controller clean up too |
80 | */ | 80 | */ |
81 | if (work && desc->chip && desc->chip->end) | 81 | if (work && desc->irq_data.chip && desc->irq_data.chip->end) |
82 | desc->chip->end(irq); | 82 | desc->irq_data.chip->end(irq); |
83 | raw_spin_unlock(&desc->lock); | 83 | raw_spin_unlock(&desc->lock); |
84 | 84 | ||
85 | return ok; | 85 | return ok; |
@@ -254,7 +254,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc, | |||
254 | printk(KERN_EMERG "Disabling IRQ #%d\n", irq); | 254 | printk(KERN_EMERG "Disabling IRQ #%d\n", irq); |
255 | desc->status |= IRQ_DISABLED | IRQ_SPURIOUS_DISABLED; | 255 | desc->status |= IRQ_DISABLED | IRQ_SPURIOUS_DISABLED; |
256 | desc->depth++; | 256 | desc->depth++; |
257 | desc->chip->disable(irq); | 257 | desc->irq_data.chip->disable(irq); |
258 | 258 | ||
259 | mod_timer(&poll_spurious_irq_timer, | 259 | mod_timer(&poll_spurious_irq_timer, |
260 | jiffies + POLL_SPURIOUS_IRQ_INTERVAL); | 260 | jiffies + POLL_SPURIOUS_IRQ_INTERVAL); |