diff options
| author | Olivier Moysan <olivier.moysan@st.com> | 2020-02-03 11:08:10 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-02-11 11:23:26 +0000 |
| commit | 7889c0082e6400ae5d07345e5573548d0999b840 (patch) | |
| tree | c766d63adf8fef9af0918e76d6b4ef333fd03c50 | |
| parent | 028476c861e3eb660d8d104ef39fccb34c04a0d5 (diff) | |
| download | linux-7889c0082e6400ae5d07345e5573548d0999b840.tar.bz2 | |
ASoC: stm32: spdifrx: manage error when getting reset controller
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>
| -rw-r--r-- | sound/soc/stm/stm32_spdifrx.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sound/soc/stm/stm32_spdifrx.c b/sound/soc/stm/stm32_spdifrx.c index 3769d9ce5dbe..9f80ddf34443 100644 --- a/sound/soc/stm/stm32_spdifrx.c +++ b/sound/soc/stm/stm32_spdifrx.c @@ -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, |