ASoC: Serialize access to dapm_power_widgets()
authorEero Nurkkala <ext-eero.nurkkala@nokia.com>
Mon, 12 Oct 2009 05:41:59 +0000 (08:41 +0300)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 13 Oct 2009 12:33:02 +0000 (13:33 +0100)
Access to damp_power_widgets() is assumed to be single-threaded.
Concurrent accesses to dapm_power_widgets() may result in
unpredictable behavior.

Calls from:
close_delayed_work()
soc_codec_close()
soc_pcm_prepare()
soc_suspend()
soc_resume_deferred()
to snd_soc_dapm_stream_event() do not have the codec->mutex
taken to cover the call to dapm_power_widgets(). Thus, take
the mutex in these paths also to assure single-threaded use
of dapm_power_widgets().

Signed-off-by: Eero Nurkkala <ext-eero.nurkkala@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/soc-dapm.c

index 8de6f9dec4a225a495825c86f2dcf03e167403fb..d89f6dc00908284d0e97e5778dfe9444b99683ff 100644 (file)
@@ -2072,9 +2072,9 @@ int snd_soc_dapm_stream_event(struct snd_soc_codec *codec,
                        }
                }
        }
-       mutex_unlock(&codec->mutex);
 
        dapm_power_widgets(codec, event);
+       mutex_unlock(&codec->mutex);
        dump_dapm(codec, __func__);
        return 0;
 }