mfd: Always initialise WM831x IRQ mutex
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 19 Oct 2009 10:07:05 +0000 (11:07 +0100)
committerSamuel Ortiz <sameo@linux.intel.com>
Mon, 26 Oct 2009 23:20:32 +0000 (00:20 +0100)
This avoids crashes when running without interrupt support.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/mfd/wm831x-irq.c

index d3015dfb9134a5402cf44d49bc456a9961229887..ac056ea6b66ed6c432e47683e0a9fe78ac0e464e 100644 (file)
@@ -507,6 +507,8 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq)
 {
        int i, ret;
 
+       mutex_init(&wm831x->irq_lock);
+
        if (!irq) {
                dev_warn(wm831x->dev,
                         "No interrupt specified - functionality limited\n");
@@ -521,7 +523,6 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq)
        }
 
        wm831x->irq = irq;
-       mutex_init(&wm831x->irq_lock);
        INIT_WORK(&wm831x->irq_work, wm831x_irq_worker);
 
        /* Mask the individual interrupt sources */