diff options
| author | Charles Keepax <ckeepax@opensource.wolfsonmicro.com> | 2017-01-18 15:27:05 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-01-18 16:26:56 +0000 |
| commit | acff07d060d8175b2b54c5bc2d9bb910a6db1049 (patch) | |
| tree | 8bbd289f2c3104e9ec2af9e7eff452a0f706b6e6 /sound/soc/codecs/wm5110.c | |
| parent | a5de5b74a50113564a1e0850e2da96c37c35e55d (diff) | |
ASoC: arizona: Propagate errors from arizona_spk_init
arizona_spk_init uses snd_soc_dapm_new_control which since
commit 37e1df8c95e2 ("ASoC: dapm: handle probe deferrals") will
occasionally request a probe deferral. Which means we should propagate the
error out of our driver from it.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/wm5110.c')
| -rw-r--r-- | sound/soc/codecs/wm5110.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index 585fc706c1b0..9a9c2d097d9e 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c @@ -2279,7 +2279,10 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec) priv->core.arizona->dapm = dapm; - arizona_init_spk(codec); + ret = arizona_init_spk(codec); + if (ret < 0) + return ret; + arizona_init_gpio(codec); arizona_init_mono(codec); arizona_init_notifiers(codec); |