diff options
| author |   Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2019-12-26 17:29:07 +0100 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2019-12-31 00:21:20 +0000 |
| commit | 9ea7a991cc27e9af1099b7a628c0ab210dc70a69 (patch) | |
| tree | 6cc8f535a2b14c687ba93260e060efaa13c41ea7 | |
| parent | ASoC: amd: Create multiple I2S platform device endpoint (diff) | |
| download | linux-dev-9ea7a991cc27e9af1099b7a628c0ab210dc70a69.tar.xz linux-dev-9ea7a991cc27e9af1099b7a628c0ab210dc70a69.zip | |
ASoC: cs47l92: Simplify error handling code in 'cs47l92_probe()'
If 'madera_init_bus_error_irq()' fails,
'wm_adsp2_remove(&cs47l92->core.adsp[0])' will be called twice.
Once in the 'if' block, and once in the error handling path.
This is harmless, but one of this call can be axed.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20191226162907.9490-1-christophe.jaillet@wanadoo.fr
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/codecs/cs47l92.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/codecs/cs47l92.c b/sound/soc/codecs/cs47l92.c index d50f75f3b3e4..536b7d35d6b2 100644 --- a/sound/soc/codecs/cs47l92.c +++ b/sound/soc/codecs/cs47l92.c @@ -1959,10 +1959,8 @@ static int cs47l92_probe(struct platform_device *pdev) goto error_dsp_irq; ret = madera_init_bus_error_irq(&cs47l92->core, 0, wm_adsp2_bus_error); - if (ret != 0) { - wm_adsp2_remove(&cs47l92->core.adsp[0]); + if (ret != 0) goto error_adsp; - } madera_init_fll(madera, 1, MADERA_FLL1_CONTROL_1 - 1, &cs47l92->fll[0]); |