From: Kuninori Morimoto Date: Wed, 7 Aug 2019 01:30:58 +0000 (+0900) Subject: ASoC: soc-core: tidyup for snd_soc_add_component_controls() X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e6d7020c2946bef2efab7c70339eee6a6b3cb6a6;p=openwrt%2Fstaging%2Fblogic.git ASoC: soc-core: tidyup for snd_soc_add_component_controls() snd_soc_add_component_controls() registers controls by using for(... i < num; ...). If controls was NULL, num should be zero. Thus, we don't need to check about controls pointer. This patch also cares missing return value. Signed-off-by: Kuninori Morimoto Link: https://lore.kernel.org/r/87ef1xahor.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown --- diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index bb1e9e2c4ff4..e481f9999bfb 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1304,10 +1304,12 @@ static int soc_probe_component(struct snd_soc_card *card, } } - if (component->driver->controls) - snd_soc_add_component_controls(component, - component->driver->controls, - component->driver->num_controls); + ret = snd_soc_add_component_controls(component, + component->driver->controls, + component->driver->num_controls); + if (ret < 0) + goto err_probe; + if (component->driver->dapm_routes) snd_soc_dapm_add_routes(dapm, component->driver->dapm_routes,