aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/ssm2518.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-13 10:19:21 -0400
committerMark Brown <broonie@linaro.org>2014-03-13 10:19:21 -0400
commit2620954d64f6f067b785faf03738b637f3473ca7 (patch)
tree00c5281e4acabc56ac1cd215a63963d956b09879 /sound/soc/codecs/ssm2518.c
parent8b3272bffe58682de568e36f9db52495f9b9d0f2 (diff)
parenta32c17b87c17f5e2e68edcf4d163ee42f9490652 (diff)
Merge remote-tracking branch 'asoc/topic/io' into asoc-next
Diffstat (limited to 'sound/soc/codecs/ssm2518.c')
-rw-r--r--sound/soc/codecs/ssm2518.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/sound/soc/codecs/ssm2518.c b/sound/soc/codecs/ssm2518.c
index 806f3d826ffb..56adb3e2def9 100644
--- a/sound/soc/codecs/ssm2518.c
+++ b/sound/soc/codecs/ssm2518.c
@@ -648,16 +648,6 @@ static struct snd_soc_dai_driver ssm2518_dai = {
648 648
649static int ssm2518_probe(struct snd_soc_codec *codec) 649static int ssm2518_probe(struct snd_soc_codec *codec)
650{ 650{
651 struct ssm2518 *ssm2518 = snd_soc_codec_get_drvdata(codec);
652 int ret;
653
654 codec->control_data = ssm2518->regmap;
655 ret = snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP);
656 if (ret < 0) {
657 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
658 return ret;
659 }
660
661 return ssm2518_set_bias_level(codec, SND_SOC_BIAS_OFF); 651 return ssm2518_set_bias_level(codec, SND_SOC_BIAS_OFF);
662} 652}
663 653