diff options
| author | Sebastian Reichel | 2014-04-05 23:35:53 +0200 |
|---|---|---|
| committer | Mark Brown | 2014-04-15 14:23:52 +0200 |
| commit | 3b5b24315781c744ab3868edee931ddb2145e6b5 (patch) | |
| tree | e20fc0ace3b41dad8f67bd1bcfecf8f7dff0f0ea /sound | |
| parent | Linux 3.15-rc1 (diff) | |
| download | kernel-qcow2-linux-3b5b24315781c744ab3868edee931ddb2145e6b5.tar.gz kernel-qcow2-linux-3b5b24315781c744ab3868edee931ddb2145e6b5.tar.xz kernel-qcow2-linux-3b5b24315781c744ab3868edee931ddb2145e6b5.zip | |
ASoC: tlv320aic3x: fix shared reset pin for DT
Currently the second tlv320aic3x instance fails to
be probed from DT if the reset pin is shared with
the first one.
This patch fixes it by moving the list add of the
reset pin into the i2c_probe method.
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/tlv320aic3x.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index b1835103e9b4..d7349bc89ad3 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -1399,7 +1399,6 @@ static int aic3x_probe(struct snd_soc_codec *codec) } aic3x_add_widgets(codec); - list_add(&aic3x->list, &reset_list); return 0; @@ -1569,7 +1568,13 @@ static int aic3x_i2c_probe(struct i2c_client *i2c, ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_aic3x, &aic3x_dai, 1); - return ret; + + if (ret != 0) + goto err_gpio; + + list_add(&aic3x->list, &reset_list); + + return 0; err_gpio: if (gpio_is_valid(aic3x->gpio_reset) && |