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/ak4641.c | |
parent | 8b3272bffe58682de568e36f9db52495f9b9d0f2 (diff) | |
parent | a32c17b87c17f5e2e68edcf4d163ee42f9490652 (diff) |
Merge remote-tracking branch 'asoc/topic/io' into asoc-next
Diffstat (limited to 'sound/soc/codecs/ak4641.c')
-rw-r--r-- | sound/soc/codecs/ak4641.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sound/soc/codecs/ak4641.c b/sound/soc/codecs/ak4641.c index 684b56f2856a..868c0e2da1ec 100644 --- a/sound/soc/codecs/ak4641.c +++ b/sound/soc/codecs/ak4641.c | |||
@@ -519,14 +519,6 @@ static int ak4641_resume(struct snd_soc_codec *codec) | |||
519 | 519 | ||
520 | static int ak4641_probe(struct snd_soc_codec *codec) | 520 | static int ak4641_probe(struct snd_soc_codec *codec) |
521 | { | 521 | { |
522 | int ret; | ||
523 | |||
524 | ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); | ||
525 | if (ret != 0) { | ||
526 | dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); | ||
527 | return ret; | ||
528 | } | ||
529 | |||
530 | /* power on device */ | 522 | /* power on device */ |
531 | ak4641_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | 523 | ak4641_set_bias_level(codec, SND_SOC_BIAS_STANDBY); |
532 | 524 | ||