summaryrefslogtreecommitdiffstats
path: root/drivers/phy
diff options
context:
space:
mode:
authorAmelie Delaunay <amelie.delaunay@st.com>2020-11-10 11:23:05 +0100
committerVinod Koul <vkoul@kernel.org>2020-11-16 15:19:03 +0530
commit13ea8e0eee4580686a9d2993ac64938cb5141526 (patch)
treeeb7ff555fb91e3721d765c9214a53d6429719749 /drivers/phy
parentf98130b34515544d3004ea64ea1dc9db77e9c65a (diff)
downloadlinux-stable-13ea8e0eee4580686a9d2993ac64938cb5141526.tar.gz
linux-stable-13ea8e0eee4580686a9d2993ac64938cb5141526.tar.bz2
linux-stable-13ea8e0eee4580686a9d2993ac64938cb5141526.zip
phy: stm32: defer probe for reset controller
Change stm32-usbphyc driver to defer its probe when the expected reset control has its probe operation deferred. Signed-off-by: Etienne Carriere <etienne.carriere@st.com> Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com> Link: https://lore.kernel.org/r/20201110102305.27205-2-amelie.delaunay@st.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/phy')
-rw-r--r--drivers/phy/st/phy-stm32-usbphyc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/phy/st/phy-stm32-usbphyc.c b/drivers/phy/st/phy-stm32-usbphyc.c
index 8ebfd567d407..a54317e96c41 100644
--- a/drivers/phy/st/phy-stm32-usbphyc.c
+++ b/drivers/phy/st/phy-stm32-usbphyc.c
@@ -340,6 +340,10 @@ static int stm32_usbphyc_probe(struct platform_device *pdev)
reset_control_assert(usbphyc->rst);
udelay(2);
reset_control_deassert(usbphyc->rst);
+ } else {
+ ret = PTR_ERR(usbphyc->rst);
+ if (ret == -EPROBE_DEFER)
+ goto clk_disable;
}
usbphyc->switch_setup = -EINVAL;