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: Etienne Carriere <etienne.carriere@st.com>
Signed-off-by: Olivier Moysan <olivier.moysan@st.com>
Link: https://lore.kernel.org/r/20200203100814.22944-2-olivier.moysan@st.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/stm/stm32_sai.c b/sound/soc/stm/stm32_sai.c
index e20267504b16719cb0f11dbcc90c8372ccd0c4c5..b824ba6cb02816dfea76a1c862858c672aa2cf4e 100644 (file)
--- a/sound/soc/stm/stm32_sai.c
+++ b/sound/soc/stm/stm32_sai.c
@@ -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);