diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-13 18:19:21 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-13 18:19:21 +0400 |
| commit | 2620954d64f6f067b785faf03738b637f3473ca7 (patch) | |
| tree | 00c5281e4acabc56ac1cd215a63963d956b09879 /sound/soc/codecs/da7210.c | |
| parent | 8b3272bffe58682de568e36f9db52495f9b9d0f2 (diff) | |
| parent | a32c17b87c17f5e2e68edcf4d163ee42f9490652 (diff) | |
| download | linux-2620954d64f6f067b785faf03738b637f3473ca7.tar.xz | |
Merge remote-tracking branch 'asoc/topic/io' into asoc-next
Diffstat (limited to 'sound/soc/codecs/da7210.c')
| -rw-r--r-- | sound/soc/codecs/da7210.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c index 01e55fc72307..137e8ebc092c 100644 --- a/sound/soc/codecs/da7210.c +++ b/sound/soc/codecs/da7210.c @@ -1071,17 +1071,9 @@ static struct snd_soc_dai_driver da7210_dai = { static int da7210_probe(struct snd_soc_codec *codec) { struct da7210_priv *da7210 = snd_soc_codec_get_drvdata(codec); - int ret; dev_info(codec->dev, "DA7210 Audio Codec %s\n", DA7210_VERSION); - codec->control_data = da7210->regmap; - ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - da7210->mclk_rate = 0; /* This will be set from set_sysclk() */ da7210->master = 0; /* This will be set from set_fmt() */ |