diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-13 18:19:21 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-13 18:19:21 +0400 |
| commit | 2620954d64f6f067b785faf03738b637f3473ca7 (patch) | |
| tree | 00c5281e4acabc56ac1cd215a63963d956b09879 /sound/soc/codecs/wm5100.c | |
| parent | 8b3272bffe58682de568e36f9db52495f9b9d0f2 (diff) | |
| parent | a32c17b87c17f5e2e68edcf4d163ee42f9490652 (diff) | |
| download | linux-2620954d64f6f067b785faf03738b637f3473ca7.tar.xz | |
Merge remote-tracking branch 'asoc/topic/io' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm5100.c')
| -rw-r--r-- | sound/soc/codecs/wm5100.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c index d3fa65fd9e85..eca983fad891 100644 --- a/sound/soc/codecs/wm5100.c +++ b/sound/soc/codecs/wm5100.c @@ -2343,13 +2343,6 @@ static int wm5100_probe(struct snd_soc_codec *codec) int ret, i; wm5100->codec = codec; - codec->control_data = wm5100->regmap; - - ret = snd_soc_codec_set_cache_io(codec, 16, 16, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } for (i = 0; i < ARRAY_SIZE(wm5100_dig_vu); i++) snd_soc_update_bits(codec, wm5100_dig_vu[i], WM5100_OUT_VU, |