]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: stm32: spdifrx: manage error when getting reset controller
authorOlivier Moysan <olivier.moysan@st.com>
Mon, 3 Feb 2020 10:08:10 +0000 (11:08 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 11 Feb 2020 11:23:26 +0000 (11:23 +0000)
Return an error when the SPDIFRX 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-3-olivier.moysan@st.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/stm/stm32_spdifrx.c

index 3769d9ce5dbef9f546bd93c11c628d1c5c6b5439..9f80ddf34443530b77c916683518eac6a5e1e1d7 100644 (file)
@@ -978,12 +978,16 @@ static int stm32_spdifrx_probe(struct platform_device *pdev)
                return ret;
        }
 
-       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);
 
        ret = devm_snd_soc_register_component(&pdev->dev,
                                              &stm32_spdifrx_component,