path: root/drivers
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2013-06-22 09:44:45 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2013-06-22 09:44:45 -1000
commitf3c15b0a128f7de42a0332107218ef747e48c288 (patch)
treeaa1606cfc629647722c4909527311646fb147e08 /drivers
parente10e57718544a321b97c036cf124d2a0b3f91d38 (diff)
parent8b6fd652641e5ab1892d092e73e83d49291ed638 (diff)
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Arnd Bergmann: "These are two fixes that came in this week, one for a regression we introduced in 3.10 in the GIC interrupt code, and the other one fixes a typo in newly introduced code" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: irqchip: gic: call gic_cpu_init() as well in CPU_STARTING_FROZEN case ARM: dts: Correct the base address of pinctrl_3 on Exynos5250
Diffstat (limited to 'drivers')
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index 1760ceb68b7..19ceaa60e0f 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -705,7 +705,7 @@ static int gic_irq_domain_xlate(struct irq_domain *d,
static int __cpuinit gic_secondary_init(struct notifier_block *nfb,
unsigned long action, void *hcpu)
- if (action == CPU_STARTING)
+ if (action == CPU_STARTING || action == CPU_STARTING_FROZEN)
return NOTIFY_OK;