From: Kuninori Morimoto Date: Fri, 17 May 2019 06:06:37 +0000 (+0900) Subject: ASoC: soc-core: WARN() is not related to component->driver->probe X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2ffb0f580bded5f16ec4d619f8abb4745425e864;p=openwrt%2Fstaging%2Fblogic.git ASoC: soc-core: WARN() is not related to component->driver->probe soc_probe_component() has WARN() under if (component->driver->probe), but, this WARN() check is not related to .probe callback. So, it should be called at (B) instead of (A). This patch moves it out of if(). if (component->driver->probe) { ret = component->driver->probe(component); ... (A) WARN(...) } (B) WARN(...) Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index e83edbe27041..ce8c057bcd5b 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1420,12 +1420,11 @@ static int soc_probe_component(struct snd_soc_card *card, "ASoC: failed to probe component %d\n", ret); goto err_probe; } - - WARN(dapm->idle_bias_off && - dapm->bias_level != SND_SOC_BIAS_OFF, - "codec %s can not start from non-off bias with idle_bias_off==1\n", - component->name); } + WARN(dapm->idle_bias_off && + dapm->bias_level != SND_SOC_BIAS_OFF, + "codec %s can not start from non-off bias with idle_bias_off==1\n", + component->name); /* machine specific init */ if (component->init) {