tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: irqchip/gic-v3: fix bad merge resolution

Browse Source 
A line from commit b19f0cc3fe ("ANDROID: power: wakeup_reason: wake
reason enhancements") got dropped.

Fixes: eb87047f08 ("Merge c457cc800e ("Merge tag 'irq-core-2020-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline")
Bug: 120445600
Change-Id: I2ac07946b60adb42114d8322b44806dce0ffc407
Signed-off-by: Eric Biggers <ebiggers@google.com>
This commit is contained in:
Eric Biggers
2020-10-22 11:42:27 -07:00
committed by Greg Kroah-Hartman
parent bfa46ee8cb
commit dfd572c112
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/irqchip/irq-gic-v3.c
+1
View File
@@ -675,6 +675,7 @@ static asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs
if (handle_domain_irq(gic_data.domain, irqnr, regs)) {
WARN_ONCE(true, "Unexpected interrupt received!\n");
log_abnormal_wakeup_reason("unexpected HW IRQ %u", irqnr);
gic_deactivate_unhandled(irqnr);
}
}