lkml.org 
[lkml]   [2010]   [Dec]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 8/9] ASoC: codecs: wm9090: Fix register cache incoherency
    Date
    The multi-component patch(commit f0fba2ad1) introduced a generic register cache
    framework. But the wm8753 driver still uses its own register cache for its
    private functions, while functions from the ASoC core use the generic cache.
    Thus we end up with two from each other incoherent caches, which leads to
    undefined behaviour.
    This pachtes fixes the issue by changing the wm9090 driver to use the generic
    cache framework.

    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    Cc: Ian Lartey <ian@opensource.wolfsonmicro.com>
    Cc: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>

    ---
    Compile tested only
    ---
    sound/soc/codecs/wm9090.c | 18 +++++++++---------
    1 files changed, 9 insertions(+), 9 deletions(-)

    diff --git a/sound/soc/codecs/wm9090.c b/sound/soc/codecs/wm9090.c
    index 7ba5807..a788c42 100644
    --- a/sound/soc/codecs/wm9090.c
    +++ b/sound/soc/codecs/wm9090.c
    @@ -140,7 +140,6 @@ static const u16 wm9090_reg_defaults[] = {
    /* This struct is used to save the context */
    struct wm9090_priv {
    struct mutex mutex;
    - u16 reg_cache[WM9090_MAX_REGISTER + 1];
    struct wm9090_platform_data pdata;
    void *control_data;
    };
    @@ -552,6 +551,7 @@ static int wm9090_set_bias_level(struct snd_soc_codec *codec,
    static int wm9090_probe(struct snd_soc_codec *codec)
    {
    struct wm9090_priv *wm9090 = snd_soc_codec_get_drvdata(codec);
    + u16 *reg_cache = codec->reg_cache;
    int ret;

    codec->control_data = wm9090->control_data;
    @@ -576,22 +576,22 @@ static int wm9090_probe(struct snd_soc_codec *codec)
    /* Configure some defaults; they will be written out when we
    * bring the bias up.
    */
    - wm9090->reg_cache[WM9090_IN1_LINE_INPUT_A_VOLUME] |= WM9090_IN1_VU
    + reg_cache[WM9090_IN1_LINE_INPUT_A_VOLUME] |= WM9090_IN1_VU
    | WM9090_IN1A_ZC;
    - wm9090->reg_cache[WM9090_IN1_LINE_INPUT_B_VOLUME] |= WM9090_IN1_VU
    + reg_cache[WM9090_IN1_LINE_INPUT_B_VOLUME] |= WM9090_IN1_VU
    | WM9090_IN1B_ZC;
    - wm9090->reg_cache[WM9090_IN2_LINE_INPUT_A_VOLUME] |= WM9090_IN2_VU
    + reg_cache[WM9090_IN2_LINE_INPUT_A_VOLUME] |= WM9090_IN2_VU
    | WM9090_IN2A_ZC;
    - wm9090->reg_cache[WM9090_IN2_LINE_INPUT_B_VOLUME] |= WM9090_IN2_VU
    + reg_cache[WM9090_IN2_LINE_INPUT_B_VOLUME] |= WM9090_IN2_VU
    | WM9090_IN2B_ZC;
    - wm9090->reg_cache[WM9090_SPEAKER_VOLUME_LEFT] |=
    + reg_cache[WM9090_SPEAKER_VOLUME_LEFT] |=
    WM9090_SPKOUT_VU | WM9090_SPKOUTL_ZC;
    - wm9090->reg_cache[WM9090_LEFT_OUTPUT_VOLUME] |=
    + reg_cache[WM9090_LEFT_OUTPUT_VOLUME] |=
    WM9090_HPOUT1_VU | WM9090_HPOUT1L_ZC;
    - wm9090->reg_cache[WM9090_RIGHT_OUTPUT_VOLUME] |=
    + reg_cache[WM9090_RIGHT_OUTPUT_VOLUME] |=
    WM9090_HPOUT1_VU | WM9090_HPOUT1R_ZC;

    - wm9090->reg_cache[WM9090_CLOCKING_1] |= WM9090_TOCLK_ENA;
    + reg_cache[WM9090_CLOCKING_1] |= WM9090_TOCLK_ENA;

    wm9090_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

    --
    1.7.2.3


    \
     
     \ /
      Last update: 2010-12-24 14:53    [W:0.047 / U:59.196 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site