[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git-commits-head
Subject:    ASoC: wm8958-dsp: Fix firmware block loading
From:       "Linux Kernel Mailing List" <linux-kernel () vger ! kernel ! org>
Date:       2014-02-28 22:55:16
Message-ID: 20140228225516.89360660CD3 () gitolite ! kernel ! org
[Download RAW message or body]

Gitweb:     http://git.kernel.org/linus/;a=commit;h=548da08fc1e245faf9b0d7c41ecd8e07984fc332
Commit:     548da08fc1e245faf9b0d7c41ecd8e07984fc332
Parent:     38dbfb59d1175ef458d006556061adeaa8751b72
Author:     Lars-Peter Clausen <lars@metafoo.de>
AuthorDate: Sat Feb 22 18:30:13 2014 +0100
Committer:  Mark Brown <broonie@linaro.org>
CommitDate: Tue Feb 25 13:39:36 2014 +0900

    ASoC: wm8958-dsp: Fix firmware block loading
    
    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>
    Cc: stable@vger.kernel.org
---
 sound/soc/codecs/wm8958-dsp2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/soc/codecs/wm8958-dsp2.c b/sound/soc/codecs/wm8958-dsp2.c
index b7488f1..d4248e0 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));
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]