diff options
| author | John Ogness <john.ogness@linutronix.de> | 2015-11-11 15:15:03 +0100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-11-26 22:11:11 +1100 |
| commit | 6c3082151e13846fd872cc216e8cbb5a59cd0b12 (patch) | |
| tree | 8c4750fecc4b9e707bfd46be2c7eec0e29e54741 | |
| parent | 57f889471c0fb55cbb0db98b30483040e2065bd9 (diff) | |
| download | op-kernel-dev-6c3082151e13846fd872cc216e8cbb5a59cd0b12.zip op-kernel-dev-6c3082151e13846fd872cc216e8cbb5a59cd0b12.tar.gz | |
powerpc/powermac: IRQF_NO_SUSPEND not IRQF_TIMER for non-timer
Since gpio1 is not a timer, it also should not use IRQF_TIMER.
Similar to commit ba461f094bab ("powerpc: Use IRQF_NO_SUSPEND not
IRQF_TIMER for non-timer interrupts").
Signed-off-by: John Ogness <john.ogness@linutronix.de>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
| -rw-r--r-- | drivers/macintosh/via-pmu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index f9512bf..01ee736 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c @@ -425,8 +425,9 @@ static int __init via_pmu_start(void) gpio_irq = irq_of_parse_and_map(gpio_node, 0); if (gpio_irq != NO_IRQ) { - if (request_irq(gpio_irq, gpio1_interrupt, IRQF_TIMER, - "GPIO1 ADB", (void *)0)) + if (request_irq(gpio_irq, gpio1_interrupt, + IRQF_NO_SUSPEND, "GPIO1 ADB", + (void *)0)) printk(KERN_ERR "pmu: can't get irq %d" " (GPIO1)\n", gpio_irq); else |
