Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus

[~andy/linux] / arch / powerpc / sysdev / cpm1.c

diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/sysdev/cpm1.c
index d4fa03f2b6acc93c20c25e4aad898145866fbf4b..5e6ff38ea69f197a873e9f47923d9f3434107221 100644 (file)
--- a/arch/powerpc/sysdev/cpm1.c
+++ b/arch/powerpc/sysdev/cpm1.c
@@ -120,6 +120,7 @@ static irqreturn_t cpm_error_interrupt(int irq, void *dev)
 
 static struct irqaction cpm_error_irqaction = {
        .handler = cpm_error_interrupt,
+       .flags = IRQF_NO_THREAD,
        .name = "error",
 };