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 83fd20194e5b..b912de4ff4de 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
@@ -326,7 +326,7 @@ void __disable_irq(struct irq_desc *desc, unsigned int irq, bool suspend) | |||
326 | if (suspend) { | 326 | if (suspend) { |
327 | if (!desc->action || (desc->action->flags & IRQF_NO_SUSPEND)) | 327 | if (!desc->action || (desc->action->flags & IRQF_NO_SUSPEND)) |
328 | return; | 328 | return; |
329 | desc->status |= IRQ_SUSPENDED; | 329 | desc->istate |= IRQS_SUSPENDED; |
330 | } | 330 | } |
331 | 331 | ||
332 | if (!desc->depth++) | 332 | if (!desc->depth++) |
@@ -388,7 +388,7 @@ EXPORT_SYMBOL(disable_irq); | |||
388 | void __enable_irq(struct irq_desc *desc, unsigned int irq, bool resume) | 388 | void __enable_irq(struct irq_desc *desc, unsigned int irq, bool resume) |
389 | { | 389 | { |
390 | if (resume) { | 390 | if (resume) { |
391 | if (!(desc->status & IRQ_SUSPENDED)) { | 391 | if (!(desc->istate & IRQS_SUSPENDED)) { |
392 | if (!desc->action) | 392 | if (!desc->action) |
393 | return; | 393 | return; |
394 | if (!(desc->action->flags & IRQF_FORCE_RESUME)) | 394 | if (!(desc->action->flags & IRQF_FORCE_RESUME)) |
@@ -396,7 +396,7 @@ void __enable_irq(struct irq_desc *desc, unsigned int irq, bool resume) | |||
396 | /* Pretend that it got disabled ! */ | 396 | /* Pretend that it got disabled ! */ |
397 | desc->depth++; | 397 | desc->depth++; |
398 | } | 398 | } |
399 | desc->status &= ~IRQ_SUSPENDED; | 399 | desc->istate &= ~IRQS_SUSPENDED; |
400 | } | 400 | } |
401 | 401 | ||
402 | switch (desc->depth) { | 402 | switch (desc->depth) { |
@@ -405,7 +405,7 @@ void __enable_irq(struct irq_desc *desc, unsigned int irq, bool resume) | |||
405 | WARN(1, KERN_WARNING "Unbalanced enable for IRQ %d\n", irq); | 405 | WARN(1, KERN_WARNING "Unbalanced enable for IRQ %d\n", irq); |
406 | break; | 406 | break; |
407 | case 1: { | 407 | case 1: { |
408 | if (desc->status & IRQ_SUSPENDED) | 408 | if (desc->istate & IRQS_SUSPENDED) |
409 | goto err_out; | 409 | goto err_out; |
410 | /* Prevent probing on this irq: */ | 410 | /* Prevent probing on this irq: */ |
411 | desc->status |= IRQ_NOPROBE; | 411 | desc->status |= IRQ_NOPROBE; |