lkml.org 
[lkml]   [2012]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 29/69] ASoC: wm8994: Ensure all AIFnCLK events are run from the _late variants
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Mark Brown <broonie@opensource.wolfsonmicro.com>

    commit c8fdc1b56611faa7b38eab6b99da5e20113661ff upstream.

    Ensure that all the actions get taken at appropriate times by calling the
    _PRE and _POST events for the aifNclk_ev functions explicitly.

    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    sound/soc/codecs/wm8994.c | 12 ++++++++----
    1 file changed, 8 insertions(+), 4 deletions(-)

    diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
    index 993639d..6d3a865 100644
    --- a/sound/soc/codecs/wm8994.c
    +++ b/sound/soc/codecs/wm8994.c
    @@ -1190,17 +1190,19 @@ static int late_enable_ev(struct snd_soc_dapm_widget *w,
    switch (event) {
    case SND_SOC_DAPM_PRE_PMU:
    if (wm8994->aif1clk_enable) {
    - aif1clk_ev(w, kcontrol, event);
    + aif1clk_ev(w, kcontrol, SND_SOC_DAPM_PRE_PMU);
    snd_soc_update_bits(codec, WM8994_AIF1_CLOCKING_1,
    WM8994_AIF1CLK_ENA_MASK,
    WM8994_AIF1CLK_ENA);
    + aif1clk_ev(w, kcontrol, SND_SOC_DAPM_POST_PMU);
    wm8994->aif1clk_enable = 0;
    }
    if (wm8994->aif2clk_enable) {
    - aif2clk_ev(w, kcontrol, event);
    + aif2clk_ev(w, kcontrol, SND_SOC_DAPM_PRE_PMU);
    snd_soc_update_bits(codec, WM8994_AIF2_CLOCKING_1,
    WM8994_AIF2CLK_ENA_MASK,
    WM8994_AIF2CLK_ENA);
    + aif2clk_ev(w, kcontrol, SND_SOC_DAPM_POST_PMU);
    wm8994->aif2clk_enable = 0;
    }
    break;
    @@ -1221,15 +1223,17 @@ static int late_disable_ev(struct snd_soc_dapm_widget *w,
    switch (event) {
    case SND_SOC_DAPM_POST_PMD:
    if (wm8994->aif1clk_disable) {
    + aif1clk_ev(w, kcontrol, SND_SOC_DAPM_PRE_PMD);
    snd_soc_update_bits(codec, WM8994_AIF1_CLOCKING_1,
    WM8994_AIF1CLK_ENA_MASK, 0);
    - aif1clk_ev(w, kcontrol, event);
    + aif1clk_ev(w, kcontrol, SND_SOC_DAPM_POST_PMD);
    wm8994->aif1clk_disable = 0;
    }
    if (wm8994->aif2clk_disable) {
    + aif2clk_ev(w, kcontrol, SND_SOC_DAPM_PRE_PMD);
    snd_soc_update_bits(codec, WM8994_AIF2_CLOCKING_1,
    WM8994_AIF2CLK_ENA_MASK, 0);
    - aif2clk_ev(w, kcontrol, event);
    + aif2clk_ev(w, kcontrol, SND_SOC_DAPM_POST_PMD);
    wm8994->aif2clk_disable = 0;
    }
    break;



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