diff options
Diffstat (limited to 'kernel/irq/manage.c')
-rw-r--r-- | kernel/irq/manage.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index b3986bce64ff..f3f36f6af9a1 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
@@ -223,7 +223,7 @@ void __disable_irq(struct irq_desc *desc, unsigned int irq, bool suspend) | |||
223 | 223 | ||
224 | if (!desc->depth++) { | 224 | if (!desc->depth++) { |
225 | desc->status |= IRQ_DISABLED; | 225 | desc->status |= IRQ_DISABLED; |
226 | desc->irq_data.chip->disable(irq); | 226 | desc->irq_data.chip->irq_disable(&desc->irq_data); |
227 | } | 227 | } |
228 | } | 228 | } |
229 | 229 | ||
@@ -919,10 +919,10 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id) | |||
919 | /* If this was the last handler, shut down the IRQ line: */ | 919 | /* If this was the last handler, shut down the IRQ line: */ |
920 | if (!desc->action) { | 920 | if (!desc->action) { |
921 | desc->status |= IRQ_DISABLED; | 921 | desc->status |= IRQ_DISABLED; |
922 | if (desc->irq_data.chip->shutdown) | 922 | if (desc->irq_data.chip->irq_shutdown) |
923 | desc->irq_data.chip->shutdown(irq); | 923 | desc->irq_data.chip->irq_shutdown(&desc->irq_data); |
924 | else | 924 | else |
925 | desc->irq_data.chip->disable(irq); | 925 | desc->irq_data.chip->irq_disable(&desc->irq_data); |
926 | } | 926 | } |
927 | 927 | ||
928 | #ifdef CONFIG_SMP | 928 | #ifdef CONFIG_SMP |