3.16.50-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Florian Fainelli <f.faine...@gmail.com>

commit c017d21147848fe017772764a77a7f32c5b017f9 upstream.

The Broadcom STB platforms support S5 and we allow specific hardware
wake-up events to take us out of this state. Because we were not
defining an irq_pm_shutdown() function pointer, we would not be
correctly masking non-wakeup events, which would result in spurious
wake-ups from sources that were not explicitly configured for wake-up.

Fixes: 7f646e92766e ("irqchip: brcmstb-l2: Add Broadcom Set Top Box Level-2 
interrupt controller")
Acked-by: Gregory Fong <gregory.0...@gmail.com>
Signed-off-by: Florian Fainelli <f.faine...@gmail.com>
Signed-off-by: Marc Zyngier <marc.zyng...@arm.com>
Signed-off-by: Ben Hutchings <b...@decadent.org.uk>
---
 drivers/irqchip/irq-brcmstb-l2.c | 1 +
 1 file changed, 1 insertion(+)

--- a/drivers/irqchip/irq-brcmstb-l2.c
+++ b/drivers/irqchip/irq-brcmstb-l2.c
@@ -176,6 +176,7 @@ int __init brcmstb_l2_intc_of_init(struc
 
        ct->chip.irq_suspend = brcmstb_l2_intc_suspend;
        ct->chip.irq_resume = brcmstb_l2_intc_resume;
+       ct->chip.irq_pm_shutdown = brcmstb_l2_intc_suspend;
 
        if (of_property_read_bool(np, "brcm,irq-can-wake")) {
                data->can_wake = true;

Reply via email to