diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-04 15:53:48 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-04 23:24:58 +0000 |
| commit | 5a3ad6bd6ae0687cb0ecb424d74221920fbc7f38 (patch) | |
| tree | 0f6c01e27694de1ef894543a53703ae4bce75730 | |
| parent | 8eeea521d9d0fa6afd62df8c6e6566ee946117fa (diff) | |
| download | linux-3.10-5a3ad6bd6ae0687cb0ecb424d74221920fbc7f38.tar.gz linux-3.10-5a3ad6bd6ae0687cb0ecb424d74221920fbc7f38.tar.bz2 linux-3.10-5a3ad6bd6ae0687cb0ecb424d74221920fbc7f38.zip | |
ASoC: Don't use wm8994->control_data when requesting IRQs
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>
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 3d2c3d4711d..9cb16cc853b 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -3180,9 +3180,9 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) wm8994_request_irq(codec->control_data, WM8994_IRQ_FIFOS_ERR, wm8994_fifo_error, "FIFO error", codec); - wm8994_request_irq(wm8994->control_data, WM8994_IRQ_TEMP_WARN, + wm8994_request_irq(codec->control_data, WM8994_IRQ_TEMP_WARN, wm8994_temp_warn, "Thermal warning", codec); - wm8994_request_irq(wm8994->control_data, WM8994_IRQ_TEMP_SHUT, + wm8994_request_irq(codec->control_data, WM8994_IRQ_TEMP_SHUT, wm8994_temp_shut, "Thermal shutdown", codec); ret = wm8994_request_irq(codec->control_data, WM8994_IRQ_DCS_DONE, |