Unverified Commit 8ed33111 authored by Li Jian's avatar Li Jian Committed by Mark Brown
Browse files

ASoC: ES8389: convert to devm_clk_get_optional() to get clock



When enabling ES8390 via ACPI description, es8389 would fail to
obtain a clock source, causing the driver to fail to initialize.
This was not an issue with older kernels, but since commit
abae8e57 ("clk: generalize devm_clk_get() a bit"),
devm_clk_get() would return an error pointer when a clock source
was not detected (instead of falling back to a static clock),
causing the driver to fail early.

Use devm_clk_get_optional() instead to return to the previous
behaviour, allowing the use of a static clock source.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarLi Jian <lazycat-xiao@foxmail.com>
Link: https://patch.msgid.link/tencent_7C78374FB9F4B3A37101E5C719715D8BC40A@qq.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 74c876bf
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -892,7 +892,7 @@ static int es8389_probe(struct snd_soc_component *component)
		return ret;
	}

	es8389->mclk = devm_clk_get(component->dev, "mclk");
	es8389->mclk = devm_clk_get_optional(component->dev, "mclk");
	if (IS_ERR(es8389->mclk))
		return dev_err_probe(component->dev, PTR_ERR(es8389->mclk),
			"ES8389 is unable to get mclk\n");