Переглянути джерело

mfd: Always initialise WM831x IRQ mutex

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>
Mark Brown 15 роки тому
батько
коміт
14f572fa38
1 змінених файлів з 2 додано та 1 видалено
  1. 2 1
      drivers/mfd/wm831x-irq.c

+ 2 - 1
drivers/mfd/wm831x-irq.c

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