aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/codecs/tlv320aic3x.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 43fd9c171742..0b80e242a66d 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -1231,6 +1231,8 @@ static int aic3x_probe(struct snd_soc_codec *codec)
1231 codec->hw_write = (hw_write_t) i2c_master_send; 1231 codec->hw_write = (hw_write_t) i2c_master_send;
1232 codec->control_data = aic3x->control_data; 1232 codec->control_data = aic3x->control_data;
1233 1233
1234 aic3x_init(codec);
1235
1234 if (aic3x->setup) { 1236 if (aic3x->setup) {
1235 /* setup GPIO functions */ 1237 /* setup GPIO functions */
1236 aic3x_write(codec, AIC3X_GPIO1_REG, 1238 aic3x_write(codec, AIC3X_GPIO1_REG,
@@ -1239,8 +1241,6 @@ static int aic3x_probe(struct snd_soc_codec *codec)
1239 (aic3x->setup->gpio_func[1] & 0xf) << 4); 1241 (aic3x->setup->gpio_func[1] & 0xf) << 4);
1240 } 1242 }
1241 1243
1242 aic3x_init(codec);
1243
1244 snd_soc_add_controls(codec, aic3x_snd_controls, 1244 snd_soc_add_controls(codec, aic3x_snd_controls,
1245 ARRAY_SIZE(aic3x_snd_controls)); 1245 ARRAY_SIZE(aic3x_snd_controls));
1246 1246