mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: xen: Do not suspend IPI IRQs. powerpc: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupts ixp4xx-beeper: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupt irq: Add new IRQ flag IRQF_NO_SUSPEND
This commit is contained in:
commit
1787985782
6 changed files with 18 additions and 9 deletions
|
|
@ -400,11 +400,12 @@ static int __init via_pmu_start(void)
|
|||
printk(KERN_ERR "via-pmu: can't map interrupt\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
/* We set IRQF_TIMER because we don't want the interrupt to be disabled
|
||||
* between the 2 passes of driver suspend, we control our own disabling
|
||||
* for that one
|
||||
/* We set IRQF_NO_SUSPEND because we don't want the interrupt
|
||||
* to be disabled between the 2 passes of driver suspend, we
|
||||
* control our own disabling for that one
|
||||
*/
|
||||
if (request_irq(irq, via_pmu_interrupt, IRQF_TIMER, "VIA-PMU", (void *)0)) {
|
||||
if (request_irq(irq, via_pmu_interrupt, IRQF_NO_SUSPEND,
|
||||
"VIA-PMU", (void *)0)) {
|
||||
printk(KERN_ERR "via-pmu: can't request irq %d\n", irq);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue