Skip to contentSkip to conversation

mfd: Always initialise WM831x IRQ mutex

PATCH In review Mark Brown 2 participants 2 messages Oct 19, 2009

Subsystems (2)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 mfd: Always initialise WM831x IRQ mutex

This avoids crashes when running without interrupt support.

---
 drivers/mfd/wm831x-irq.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/mfd/wm831x-irq.c +2 -1
index d3015df..ac056ea 100644
@@ -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 */
Signature · 1 line
1.6.5
#1 lore raw

Hi Mark,

Quoted 1 line · Mark Brown

This avoids crashes when running without interrupt support.

Thanks. I'll send a pull request with a couple more fixes in a few days.

Cheers,
Samuel.

Quoted 29 lines
---
 drivers/mfd/wm831x-irq.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/mfd/wm831x-irq.c +2 -1
index d3015df..ac056ea 100644
@@ -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 */
Signature · 1 line
1.6.5
Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/