[PATCH 3.4 23/99] ASoC: wm8958-dsp: Fix firmware block loading
3.4-stable review patch. If anyone has any objections, please let me know.
--
From: Lars-Peter Clausen
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
Signed-off-by: Mark Brown
Signed-off-by: Greg Kroah-Hartman
---
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 &= 0xff;
- wm8994_bulk_write(codec->control_data,
+ wm8994_bulk_write(wm8994->wm8994,
data32 & 0xff,
block_len / 2,
(void *)(data + 8));
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 3.4 23/99] ASoC: wm8958-dsp: Fix firmware block loading
3.4-stable review patch. If anyone has any objections, please let me know. -- From: Lars-Peter Clausen l...@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 l...@metafoo.de Signed-off-by: Mark Brown broo...@linaro.org Signed-off-by: Greg Kroah-Hartman gre...@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 = 0xff; - wm8994_bulk_write(codec-control_data, + wm8994_bulk_write(wm8994-wm8994, data32 0xff, block_len / 2, (void *)(data + 8)); -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
