]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
mfd: mc13xxx-core: Initialize the lock prior to using it
authorFabio Estevam <fabio.estevam@freescale.com>
Tue, 15 Apr 2014 22:56:14 +0000 (19:56 -0300)
committerLee Jones <lee.jones@linaro.org>
Tue, 3 Jun 2014 07:11:13 +0000 (08:11 +0100)
After request_threaded_irq() is called there is a chance that an interrupt
may occur before the 'mc13xxx->lock' is initialized, which will trigger a kernel
oops.

In order to prevent that, move the initialization of 'mc13xxx->lock' prior to
requesting the interrupts.

Suggested-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/mfd/mc13xxx-core.c

index 0c6c21c5b1a841250a0f1b457005ccff1482d19c..ddabc8157eb0133abe12c1f6ef55e261006229ca 100644 (file)
@@ -660,13 +660,13 @@ int mc13xxx_common_init(struct device *dev)
        if (ret)
                return ret;
 
+       mutex_init(&mc13xxx->lock);
+
        ret = request_threaded_irq(mc13xxx->irq, NULL, mc13xxx_irq_thread,
                        IRQF_ONESHOT | IRQF_TRIGGER_HIGH, "mc13xxx", mc13xxx);
        if (ret)
                return ret;
 
-       mutex_init(&mc13xxx->lock);
-
        if (mc13xxx_probe_flags_dt(mc13xxx) < 0 && pdata)
                mc13xxx->flags = pdata->flags;