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/wm8940.c | |
parent | 8b3272bffe58682de568e36f9db52495f9b9d0f2 (diff) | |
parent | a32c17b87c17f5e2e68edcf4d163ee42f9490652 (diff) |
Merge remote-tracking branch 'asoc/topic/io' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm8940.c')
-rw-r--r-- | sound/soc/codecs/wm8940.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c index 87f032d0d19f..fc6eec9ad66b 100644 --- a/sound/soc/codecs/wm8940.c +++ b/sound/soc/codecs/wm8940.c | |||
@@ -712,12 +712,6 @@ static int wm8940_probe(struct snd_soc_codec *codec) | |||
712 | int ret; | 712 | int ret; |
713 | u16 reg; | 713 | u16 reg; |
714 | 714 | ||
715 | ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP); | ||
716 | if (ret < 0) { | ||
717 | dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); | ||
718 | return ret; | ||
719 | } | ||
720 | |||
721 | ret = wm8940_reset(codec); | 715 | ret = wm8940_reset(codec); |
722 | if (ret < 0) { | 716 | if (ret < 0) { |
723 | dev_err(codec->dev, "Failed to issue reset\n"); | 717 | dev_err(codec->dev, "Failed to issue reset\n"); |