public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-05-24 10:39:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Return an error when the i2s 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-4-olivier.moysan@st.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Olivier Moysan 2020-02-03 11:08:11 +01:00 • committed by Mark Brown
parent 7889c0082e
commit 158ecc65c0
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sound/soc/stm/stm32_i2s.c
View file

@ -866,12 +866,16 @@ static int stm32_i2s_parse_dt(struct platform_device *pdev,
} }
/* Reset */ /* Reset */
rst = devm_reset_control_get_exclusive(&pdev->dev, NULL); rst = devm_reset_control_get_optional_exclusive(&pdev->dev, NULL);
if (!IS_ERR(rst)) { if (IS_ERR(rst)) {
reset_control_assert(rst); if (PTR_ERR(rst) != -EPROBE_DEFER)
udelay(2); dev_err(&pdev->dev, "Reset controller error %ld\n",
reset_control_deassert(rst); PTR_ERR(rst));
return PTR_ERR(rst);
} }
reset_control_assert(rst);
udelay(2);
reset_control_deassert(rst);
return 0; return 0;
} }