diff options
| author | Mark Brown <broonie@linaro.org> | 2014-02-27 20:26:10 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-27 20:26:10 +0900 |
| commit | 23308e88201c2c0036da23450f7fed6fd64ae1ef (patch) | |
| tree | ca6fac41dff5a3de03e4df6c44813786ef4cdbe2 /sound | |
| parent | 2f23db13df253485329a73233cded8a022668a48 (diff) | |
| parent | 548da08fc1e245faf9b0d7c41ecd8e07984fc332 (diff) | |
| download | linux-23308e88201c2c0036da23450f7fed6fd64ae1ef.tar.gz linux-23308e88201c2c0036da23450f7fed6fd64ae1ef.tar.bz2 linux-23308e88201c2c0036da23450f7fed6fd64ae1ef.zip | |
Merge remote-tracking branch 'asoc/fix/wm8958' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | 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 b7488f190d2b..d4248e00160e 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)); |