diff options
author | Mark Brown <broonie@linaro.org> | 2014-03-13 10:19:21 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-13 10:19:21 -0400 |
commit | 2620954d64f6f067b785faf03738b637f3473ca7 (patch) | |
tree | 00c5281e4acabc56ac1cd215a63963d956b09879 /sound/soc/codecs/wm8955.c | |
parent | 8b3272bffe58682de568e36f9db52495f9b9d0f2 (diff) | |
parent | a32c17b87c17f5e2e68edcf4d163ee42f9490652 (diff) |
Merge remote-tracking branch 'asoc/topic/io' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm8955.c')
-rw-r--r-- | sound/soc/codecs/wm8955.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c index d4dcaecc8a5f..fecd4e4f4c57 100644 --- a/sound/soc/codecs/wm8955.c +++ b/sound/soc/codecs/wm8955.c | |||
@@ -895,14 +895,6 @@ static int wm8955_probe(struct snd_soc_codec *codec) | |||
895 | struct wm8955_pdata *pdata = dev_get_platdata(codec->dev); | 895 | struct wm8955_pdata *pdata = dev_get_platdata(codec->dev); |
896 | int ret, i; | 896 | int ret, i; |
897 | 897 | ||
898 | codec->control_data = wm8955->regmap; | ||
899 | |||
900 | ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); | ||
901 | if (ret != 0) { | ||
902 | dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); | ||
903 | return ret; | ||
904 | } | ||
905 | |||
906 | for (i = 0; i < ARRAY_SIZE(wm8955->supplies); i++) | 898 | for (i = 0; i < ARRAY_SIZE(wm8955->supplies); i++) |
907 | wm8955->supplies[i].supply = wm8955_supply_names[i]; | 899 | wm8955->supplies[i].supply = wm8955_supply_names[i]; |
908 | 900 | ||