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/sta529.c | |
parent | 8b3272bffe58682de568e36f9db52495f9b9d0f2 (diff) | |
parent | a32c17b87c17f5e2e68edcf4d163ee42f9490652 (diff) |
Merge remote-tracking branch 'asoc/topic/io' into asoc-next
Diffstat (limited to 'sound/soc/codecs/sta529.c')
-rw-r--r-- | sound/soc/codecs/sta529.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sound/soc/codecs/sta529.c b/sound/soc/codecs/sta529.c index f15b0e37274c..a3c61d308bb0 100644 --- a/sound/soc/codecs/sta529.c +++ b/sound/soc/codecs/sta529.c | |||
@@ -322,16 +322,6 @@ static struct snd_soc_dai_driver sta529_dai = { | |||
322 | 322 | ||
323 | static int sta529_probe(struct snd_soc_codec *codec) | 323 | static int sta529_probe(struct snd_soc_codec *codec) |
324 | { | 324 | { |
325 | struct sta529 *sta529 = snd_soc_codec_get_drvdata(codec); | ||
326 | int ret; | ||
327 | |||
328 | codec->control_data = sta529->regmap; | ||
329 | ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); | ||
330 | |||
331 | if (ret < 0) { | ||
332 | dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); | ||
333 | return ret; | ||
334 | } | ||
335 | sta529_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | 325 | sta529_set_bias_level(codec, SND_SOC_BIAS_STANDBY); |
336 | 326 | ||
337 | return 0; | 327 | return 0; |