Unverified Commit 2ffb0f58 authored May 17, 2019 by Kuninori Morimoto Committed by Mark Brown May 20, 2019

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 <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent e9b5daad

sound/soc/soc-core.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -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);
		}

		/* machine specific init */
		if (component->init) {

Admin message