| From 548da08fc1e245faf9b0d7c41ecd8e07984fc332 Mon Sep 17 00:00:00 2001 |
| From: Lars-Peter Clausen <lars@metafoo.de> |
| Date: Sat, 22 Feb 2014 18:30:13 +0100 |
| Subject: ASoC: wm8958-dsp: Fix firmware block loading |
| |
| From: Lars-Peter Clausen <lars@metafoo.de> |
| |
| commit 548da08fc1e245faf9b0d7c41ecd8e07984fc332 upstream. |
| |
| The codec->control_data contains a pointer to the device's regmap struct. But |
| wm8994_bulk_write() expects a pointer to the parent wm8998 device. |
| |
| The issue was introduced in commit d9a7666f ("ASoC: Remove ASoC-specific |
| WM8994 I/O code"). |
| |
| Fixes: d9a7666f ("ASoC: Remove ASoC-specific WM8994 I/O code") |
| Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> |
| Signed-off-by: Mark Brown <broonie@linaro.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| sound/soc/codecs/wm8958-dsp2.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/sound/soc/codecs/wm8958-dsp2.c |
| +++ b/sound/soc/codecs/wm8958-dsp2.c |
| @@ -153,7 +153,7 @@ static int wm8958_dsp2_fw(struct snd_soc |
| |
| data32 &= 0xffffff; |
| |
| - wm8994_bulk_write(codec->control_data, |
| + wm8994_bulk_write(wm8994->wm8994, |
| data32 & 0xffffff, |
| block_len / 2, |
| (void *)(data + 8)); |
