diff options
Diffstat (limited to 'extras/recipes-kernel/linux/linux-omap/linus/0024-ASoC-codecs-wm9090-Fix-register-cache-incoherency.patch')
| -rw-r--r-- | extras/recipes-kernel/linux/linux-omap/linus/0024-ASoC-codecs-wm9090-Fix-register-cache-incoherency.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/extras/recipes-kernel/linux/linux-omap/linus/0024-ASoC-codecs-wm9090-Fix-register-cache-incoherency.patch b/extras/recipes-kernel/linux/linux-omap/linus/0024-ASoC-codecs-wm9090-Fix-register-cache-incoherency.patch new file mode 100644 index 00000000..ad5aedd1 --- /dev/null +++ b/extras/recipes-kernel/linux/linux-omap/linus/0024-ASoC-codecs-wm9090-Fix-register-cache-incoherency.patch @@ -0,0 +1,75 @@ +From 2f2f23c75c1c055ca6274b04bd2dc71d0a6e8c62 Mon Sep 17 00:00:00 2001 +From: Lars-Peter Clausen <lars@metafoo.de> +Date: Tue, 28 Dec 2010 21:38:02 +0100 +Subject: [PATCH 24/65] ASoC: codecs: wm9090: Fix register cache incoherency + +The multi-component patch(commit f0fba2ad1) moved the allocation of the +register cache from the driver to the ASoC core. Most drivers where adjusted to +this, but the wm9090 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 can lead to +undefined behaviour. +This patch fixes the issue by changing the wm9090 driver to use the +generic register cache in its private functions. + +Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> +Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> +Cc: stable@kernel.org (for 2.6.37 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 99c046b..6e5f64f 100644 +--- a/sound/soc/codecs/wm9090.c ++++ b/sound/soc/codecs/wm9090.c +@@ -141,7 +141,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.6.6.1 + |