Skip to content

Commit

Permalink
mfd: Always initialise WM831x IRQ mutex
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mark Brown authored and Samuel Ortiz committed Oct 26, 2009
1 parent 964fe08 commit 14f572f
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/mfd/wm831x-irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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 */
Expand Down

0 comments on commit 14f572f

Please sign in to comment.