diff options
| author | Amelie Delaunay <amelie.delaunay@st.com> | 2020-01-27 09:53:32 +0100 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2020-02-24 17:50:01 +0100 |
| commit | 56cf8ddaa3115db5543d2a49b669bf4010eaff19 (patch) | |
| tree | d92cf5487db2d49612ea7ff32cc095fc06673a09 /drivers/dma/stm32-mdma.c | |
| parent | dmaengine: stm32-mdma: disable clock in case of error during probe (diff) | |
| download | linux-56cf8ddaa3115db5543d2a49b669bf4010eaff19.tar.xz linux-56cf8ddaa3115db5543d2a49b669bf4010eaff19.zip | |
dmaengine: stm32-mdma: driver defers probe for clock and reset
This patch changes error log when failing to get the clock so that it is
not printed on failure with probe deferring.
It also defers probe when reset controller is expected but has not been
probed yet when MDMA device is probed.
Signed-off-by: Etienne Carriere <etienne.carriere@st.com>
Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com>
Link: https://lore.kernel.org/r/20200127085334.13163-5-amelie.delaunay@st.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/dma/stm32-mdma.c')
| -rw-r--r-- | drivers/dma/stm32-mdma.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/dma/stm32-mdma.c b/drivers/dma/stm32-mdma.c index f23c82e3990c..2dbd1f38a6f5 100644 --- a/drivers/dma/stm32-mdma.c +++ b/drivers/dma/stm32-mdma.c @@ -1579,8 +1579,8 @@ static int stm32_mdma_probe(struct platform_device *pdev) dmadev->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(dmadev->clk)) { ret = PTR_ERR(dmadev->clk); - if (ret == -EPROBE_DEFER) - dev_info(&pdev->dev, "Missing controller clock\n"); + if (ret != -EPROBE_DEFER) + dev_err(&pdev->dev, "Missing clock controller\n"); return ret; } @@ -1591,7 +1591,11 @@ static int stm32_mdma_probe(struct platform_device *pdev) } rst = devm_reset_control_get(&pdev->dev, NULL); - if (!IS_ERR(rst)) { + if (IS_ERR(rst)) { + ret = PTR_ERR(rst); + if (ret == -EPROBE_DEFER) + goto err_clk; + } else { reset_control_assert(rst); udelay(2); reset_control_deassert(rst); |