diff options
Diffstat (limited to 'sound/soc/codecs/adau1373.c')
-rw-r--r-- | sound/soc/codecs/adau1373.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/codecs/adau1373.c b/sound/soc/codecs/adau1373.c index 971ba4529171..44f59064d8de 100644 --- a/sound/soc/codecs/adau1373.c +++ b/sound/soc/codecs/adau1373.c | |||
@@ -1244,8 +1244,6 @@ static int adau1373_probe(struct snd_soc_codec *codec) | |||
1244 | return ret; | 1244 | return ret; |
1245 | } | 1245 | } |
1246 | 1246 | ||
1247 | codec->dapm.idle_bias_off = true; | ||
1248 | |||
1249 | if (pdata) { | 1247 | if (pdata) { |
1250 | if (pdata->num_drc > ARRAY_SIZE(pdata->drc_setting)) | 1248 | if (pdata->num_drc > ARRAY_SIZE(pdata->drc_setting)) |
1251 | return -EINVAL; | 1249 | return -EINVAL; |
@@ -1259,7 +1257,7 @@ static int adau1373_probe(struct snd_soc_codec *codec) | |||
1259 | pdata->drc_setting[i]); | 1257 | pdata->drc_setting[i]); |
1260 | } | 1258 | } |
1261 | 1259 | ||
1262 | snd_soc_add_controls(codec, adau1373_drc_controls, | 1260 | snd_soc_add_codec_controls(codec, adau1373_drc_controls, |
1263 | pdata->num_drc); | 1261 | pdata->num_drc); |
1264 | 1262 | ||
1265 | val = 0; | 1263 | val = 0; |
@@ -1284,7 +1282,7 @@ static int adau1373_probe(struct snd_soc_codec *codec) | |||
1284 | } | 1282 | } |
1285 | 1283 | ||
1286 | if (!lineout_differential) { | 1284 | if (!lineout_differential) { |
1287 | snd_soc_add_controls(codec, adau1373_lineout2_controls, | 1285 | snd_soc_add_codec_controls(codec, adau1373_lineout2_controls, |
1288 | ARRAY_SIZE(adau1373_lineout2_controls)); | 1286 | ARRAY_SIZE(adau1373_lineout2_controls)); |
1289 | } | 1287 | } |
1290 | 1288 | ||
@@ -1340,6 +1338,7 @@ static struct snd_soc_codec_driver adau1373_codec_driver = { | |||
1340 | .suspend = adau1373_suspend, | 1338 | .suspend = adau1373_suspend, |
1341 | .resume = adau1373_resume, | 1339 | .resume = adau1373_resume, |
1342 | .set_bias_level = adau1373_set_bias_level, | 1340 | .set_bias_level = adau1373_set_bias_level, |
1341 | .idle_bias_off = true, | ||
1343 | .reg_cache_size = ARRAY_SIZE(adau1373_default_regs), | 1342 | .reg_cache_size = ARRAY_SIZE(adau1373_default_regs), |
1344 | .reg_cache_default = adau1373_default_regs, | 1343 | .reg_cache_default = adau1373_default_regs, |
1345 | .reg_word_size = sizeof(uint8_t), | 1344 | .reg_word_size = sizeof(uint8_t), |