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/ssm2602.c | |
parent | 8b3272bffe58682de568e36f9db52495f9b9d0f2 (diff) | |
parent | a32c17b87c17f5e2e68edcf4d163ee42f9490652 (diff) |
Merge remote-tracking branch 'asoc/topic/io' into asoc-next
Diffstat (limited to 'sound/soc/codecs/ssm2602.c')
-rw-r--r-- | sound/soc/codecs/ssm2602.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index 12947096897c..97b0454eb346 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c | |||
@@ -562,13 +562,6 @@ static int ssm260x_codec_probe(struct snd_soc_codec *codec) | |||
562 | struct ssm2602_priv *ssm2602 = snd_soc_codec_get_drvdata(codec); | 562 | struct ssm2602_priv *ssm2602 = snd_soc_codec_get_drvdata(codec); |
563 | int ret; | 563 | int ret; |
564 | 564 | ||
565 | codec->control_data = ssm2602->regmap; | ||
566 | ret = snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP); | ||
567 | if (ret < 0) { | ||
568 | dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); | ||
569 | return ret; | ||
570 | } | ||
571 | |||
572 | ret = regmap_write(ssm2602->regmap, SSM2602_RESET, 0); | 565 | ret = regmap_write(ssm2602->regmap, SSM2602_RESET, 0); |
573 | if (ret < 0) { | 566 | if (ret < 0) { |
574 | dev_err(codec->dev, "Failed to issue reset: %d\n", ret); | 567 | dev_err(codec->dev, "Failed to issue reset: %d\n", ret); |