lkml.org 
[lkml]   [2014]   [Feb]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 07/17 v2] ASoC: wm8962: Update locking around use of DAPM pin API
    Date
    The pin updates in this driver look like they are intended to be done
    atomically, update to do so.

    Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
    ---
    sound/soc/codecs/wm8962.c | 13 +++++++++----
    1 files changed, 9 insertions(+), 4 deletions(-)

    diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
    index c06bb50..3be4633 100644
    --- a/sound/soc/codecs/wm8962.c
    +++ b/sound/soc/codecs/wm8962.c
    @@ -3106,6 +3106,7 @@ static irqreturn_t wm8962_irq(int irq, void *data)
    int wm8962_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack)
    {
    struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec);
    + struct snd_soc_dapm_context *dapm = &codec->dapm;
    int irq_mask, enable;

    wm8962->jack = jack;
    @@ -3126,14 +3127,18 @@ int wm8962_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack)
    snd_soc_jack_report(wm8962->jack, 0,
    SND_JACK_MICROPHONE | SND_JACK_BTN_0);

    + snd_soc_dapm_mutex_lock(dapm);
    +
    if (jack) {
    - snd_soc_dapm_force_enable_pin(&codec->dapm, "SYSCLK");
    - snd_soc_dapm_force_enable_pin(&codec->dapm, "MICBIAS");
    + snd_soc_dapm_force_enable_pin_unlocked(dapm, "SYSCLK");
    + snd_soc_dapm_force_enable_pin_unlocked(dapm, "MICBIAS");
    } else {
    - snd_soc_dapm_disable_pin(&codec->dapm, "SYSCLK");
    - snd_soc_dapm_disable_pin(&codec->dapm, "MICBIAS");
    + snd_soc_dapm_disable_pin_unlocked(dapm, "SYSCLK");
    + snd_soc_dapm_disable_pin_unlocked(dapm, "MICBIAS");
    }

    + snd_soc_dapm_mutex_unlock(dapm);
    +
    return 0;
    }
    EXPORT_SYMBOL_GPL(wm8962_mic_detect);
    --
    1.7.2.5


    \
     
     \ /
      Last update: 2014-02-18 17:21    [W:4.187 / U:0.620 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site