Commit 028476c8 authored by Olivier Moysan's avatar Olivier Moysan Committed by Mark Brown

ASoC: stm32: sai: manage error when getting reset controller

Return an error when the SAI driver fails to get a reset controller.
Also add an error trace, except on probe defer status.
Signed-off-by: default avatarEtienne Carriere <etienne.carriere@st.com>
Signed-off-by: default avatarOlivier Moysan <olivier.moysan@st.com>
Link: https://lore.kernel.org/r/20200203100814.22944-2-olivier.moysan@st.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent b5848c81
......@@ -197,12 +197,16 @@ static int stm32_sai_probe(struct platform_device *pdev)
return sai->irq;
/* reset */
rst = devm_reset_control_get_exclusive(&pdev->dev, NULL);
if (!IS_ERR(rst)) {
reset_control_assert(rst);
udelay(2);
reset_control_deassert(rst);
rst = devm_reset_control_get_optional_exclusive(&pdev->dev, NULL);
if (IS_ERR(rst)) {
if (PTR_ERR(rst) != -EPROBE_DEFER)
dev_err(&pdev->dev, "Reset controller error %ld\n",
PTR_ERR(rst));
return PTR_ERR(rst);
}
reset_control_assert(rst);
udelay(2);
reset_control_deassert(rst);
/* Enable peripheral clock to allow register access */
ret = clk_prepare_enable(sai->pclk);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment