diff options
| author | Olivier Moysan <olivier.moysan@st.com> | 2020-02-03 13:08:09 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-02-11 14:23:07 +0300 |
| commit | 028476c861e3eb660d8d104ef39fccb34c04a0d5 (patch) | |
| tree | 6aa84bc372b5c83c54ec76382a4c9ca9ad22f37f /sound/soc | |
| parent | b5848c814cdb6ea87f77559a143c464101330c7e (diff) | |
| download | linux-028476c861e3eb660d8d104ef39fccb34c04a0d5.tar.xz | |
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>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/stm/stm32_sai.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sound/soc/stm/stm32_sai.c b/sound/soc/stm/stm32_sai.c index e20267504b16..b824ba6cb028 100644 --- 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); |