diff options
author | Mark Brown <broonie@linaro.org> | 2014-03-13 15:19:21 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-13 15:19:21 +0100 |
commit | 2620954d64f6f067b785faf03738b637f3473ca7 (patch) | |
tree | 00c5281e4acabc56ac1cd215a63963d956b09879 /sound/soc/codecs/wm8731.c | |
parent | Merge remote-tracking branch 'asoc/topic/intel' into asoc-next (diff) | |
parent | ASoC: core: Fix check before setting default I/O up try regmap (diff) | |
download | linux-2620954d64f6f067b785faf03738b637f3473ca7.tar.xz linux-2620954d64f6f067b785faf03738b637f3473ca7.zip |
Merge remote-tracking branch 'asoc/topic/io' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm8731.c')
-rw-r--r-- | sound/soc/codecs/wm8731.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index d9655f981df1..d74f43975b90 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -583,13 +583,6 @@ static int wm8731_probe(struct snd_soc_codec *codec) struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); int ret = 0, i; - codec->control_data = wm8731->regmap; - ret = snd_soc_codec_set_cache_io(codec, 7, 9, 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(wm8731->supplies); i++) wm8731->supplies[i].supply = wm8731_supply_names[i]; |