diff mbox

ASoC: wm8958-dsp: Fix firmware block loading

Message ID 1393090213-10532-1-git-send-email-lars@metafoo.de (mailing list archive)
State Accepted
Commit 548da08fc1e245faf9b0d7c41ecd8e07984fc332
Headers show

Commit Message

Lars-Peter Clausen Feb. 22, 2014, 5:30 p.m. UTC 
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").

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 sound/soc/codecs/wm8958-dsp2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mark Brown Feb. 25, 2014, 4:37 a.m. UTC | #1 
On Sat, Feb 22, 2014 at 06:30:13PM +0100, Lars-Peter Clausen wrote:
> 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.

Applied, thanks.
diff mbox

Patch

diff --git a/sound/soc/codecs/wm8958-dsp2.c b/sound/soc/codecs/wm8958-dsp2.c
index 1974377..7ac2e51 100644
--- 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_codec *codec, const char *name,
 
 			data32 &= 0xffffff;
 
-			wm8994_bulk_write(codec->control_data,
+			wm8994_bulk_write(wm8994->wm8994,
 					  data32 & 0xffffff,
 					  block_len / 2,
 					  (void *)(data + 8));