diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-04 11:52:31 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-04 19:24:58 -0400 |
| commit | 8eeea521d9d0fa6afd62df8c6e6566ee946117fa (patch) | |
| tree | c9abd18fa17a046b6111f9c11f0789b59dbd2e3f /sound | |
| parent | 86f14df8ed1ecec5cefe7d002b4d297e298238c2 (diff) | |
ASoC: Don't use wm8994->control_data in wm8994_readable_register()
The field is no longer initialised so this will crash if running on
wm8958.
Reported-by: Thomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 6b73efd26991..3d2c3d4711d0 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c | |||
| @@ -56,7 +56,7 @@ static int wm8994_retune_mobile_base[] = { | |||
| 56 | static int wm8994_readable(struct snd_soc_codec *codec, unsigned int reg) | 56 | static int wm8994_readable(struct snd_soc_codec *codec, unsigned int reg) |
| 57 | { | 57 | { |
| 58 | struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); | 58 | struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); |
| 59 | struct wm8994 *control = wm8994->control_data; | 59 | struct wm8994 *control = codec->control_data; |
| 60 | 60 | ||
| 61 | switch (reg) { | 61 | switch (reg) { |
| 62 | case WM8994_GPIO_1: | 62 | case WM8994_GPIO_1: |