| commit | 23308e88201c2c0036da23450f7fed6fd64ae1ef | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Thu Feb 27 20:26:10 2014 +0900 |
| committer | Mark Brown <broonie@linaro.org> | Thu Feb 27 20:26:10 2014 +0900 |
| tree | ca6fac41dff5a3de03e4df6c44813786ef4cdbe2 | |
| parent | 2f23db13df253485329a73233cded8a022668a48 [diff] | |
| parent | 548da08fc1e245faf9b0d7c41ecd8e07984fc332 [diff] |
Merge remote-tracking branch 'asoc/fix/wm8958' into asoc-linus
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 @@ data32 &= 0xffffff; - wm8994_bulk_write(codec->control_data, + wm8994_bulk_write(wm8994->wm8994, data32 & 0xffffff, block_len / 2, (void *)(data + 8));