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/tlv320aic26.c | |
| parent | 8b3272bffe58682de568e36f9db52495f9b9d0f2 (diff) | |
| parent | a32c17b87c17f5e2e68edcf4d163ee42f9490652 (diff) | |
Merge remote-tracking branch 'asoc/topic/io' into asoc-next
Diffstat (limited to 'sound/soc/codecs/tlv320aic26.c')
| -rw-r--r-- | sound/soc/codecs/tlv320aic26.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c index ff5f23d482b7..43069de3d56a 100644 --- a/sound/soc/codecs/tlv320aic26.c +++ b/sound/soc/codecs/tlv320aic26.c | |||
| @@ -296,8 +296,6 @@ static int aic26_probe(struct snd_soc_codec *codec) | |||
| 296 | struct aic26 *aic26 = dev_get_drvdata(codec->dev); | 296 | struct aic26 *aic26 = dev_get_drvdata(codec->dev); |
| 297 | int ret, reg; | 297 | int ret, reg; |
| 298 | 298 | ||
| 299 | snd_soc_codec_set_cache_io(codec, 16, 16, SND_SOC_REGMAP); | ||
| 300 | |||
| 301 | aic26->codec = codec; | 299 | aic26->codec = codec; |
| 302 | 300 | ||
| 303 | /* Reset the codec to power on defaults */ | 301 | /* Reset the codec to power on defaults */ |