* [PATCH 2.6.32] mfd: Always initialise WM831x IRQ mutex
@ 2009-10-19 10:07 Mark Brown
2009-10-19 18:42 ` Samuel Ortiz
0 siblings, 1 reply; 2+ messages in thread
From: Mark Brown @ 2009-10-19 10:07 UTC (permalink / raw)
To: Samuel Ortiz; +Cc: linux-kernel, Mark Brown
This avoids crashes when running without interrupt support.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
drivers/mfd/wm831x-irq.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/mfd/wm831x-irq.c b/drivers/mfd/wm831x-irq.c
index d3015df..ac056ea 100644
--- a/drivers/mfd/wm831x-irq.c
+++ b/drivers/mfd/wm831x-irq.c
@@ -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 */
--
1.6.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 2.6.32] mfd: Always initialise WM831x IRQ mutex
2009-10-19 10:07 [PATCH 2.6.32] mfd: Always initialise WM831x IRQ mutex Mark Brown
@ 2009-10-19 18:42 ` Samuel Ortiz
0 siblings, 0 replies; 2+ messages in thread
From: Samuel Ortiz @ 2009-10-19 18:42 UTC (permalink / raw)
To: Mark Brown; +Cc: linux-kernel
Hi Mark,
On Mon, Oct 19, 2009 at 11:07:05AM +0100, Mark Brown wrote:
> 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.
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
> drivers/mfd/wm831x-irq.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mfd/wm831x-irq.c b/drivers/mfd/wm831x-irq.c
> index d3015df..ac056ea 100644
> --- a/drivers/mfd/wm831x-irq.c
> +++ b/drivers/mfd/wm831x-irq.c
> @@ -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 */
> --
> 1.6.5
>
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-10-19 18:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-19 10:07 [PATCH 2.6.32] mfd: Always initialise WM831x IRQ mutex Mark Brown
2009-10-19 18:42 ` Samuel Ortiz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).