diff options
| author | Olof Johansson <olof@lixom.net> | 2022-01-05 16:18:15 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2022-01-05 16:18:17 -0800 |
| commit | fde9ec3c1b3dd361bff62fc89d95d03df51a0648 (patch) | |
| tree | 9cd202cbada3967fa98c1fb3678f098eb62b1027 /drivers/reset/reset-rzg2l-usbphy-ctrl.c | |
| parent | 7ad8b2fcb8509792a1714d937263aeb5bff4f654 (diff) | |
| parent | 92c959bae2e54ba1e2540ba5f813f7752bd76be1 (diff) | |
Merge tag 'reset-fixes-for-v5.16-2' of git://git.pengutronix.de/pza/linux into arm/fixes
Reset controller fixes for v5.16, part 2
Fix pm_runtime_resume_and_get() error handling in the
reset-rzg2l-usbphy-ctrl driver.
* tag 'reset-fixes-for-v5.16-2' of git://git.pengutronix.de/pza/linux:
reset: renesas: Fix Runtime PM usage
reset: tegra-bpmp: Revert Handle errors in BPMP response
Link: https://lore.kernel.org/r/20220105172515.273947-1-p.zabel@pengutronix.de
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/reset/reset-rzg2l-usbphy-ctrl.c')
| -rw-r--r-- | drivers/reset/reset-rzg2l-usbphy-ctrl.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/reset/reset-rzg2l-usbphy-ctrl.c b/drivers/reset/reset-rzg2l-usbphy-ctrl.c index e0704fd2b533..1e8315038850 100644 --- a/drivers/reset/reset-rzg2l-usbphy-ctrl.c +++ b/drivers/reset/reset-rzg2l-usbphy-ctrl.c @@ -137,7 +137,12 @@ static int rzg2l_usbphy_ctrl_probe(struct platform_device *pdev) dev_set_drvdata(dev, priv); pm_runtime_enable(&pdev->dev); - pm_runtime_resume_and_get(&pdev->dev); + error = pm_runtime_resume_and_get(&pdev->dev); + if (error < 0) { + pm_runtime_disable(&pdev->dev); + reset_control_assert(priv->rstc); + return dev_err_probe(&pdev->dev, error, "pm_runtime_resume_and_get failed"); + } /* put pll and phy into reset state */ spin_lock_irqsave(&priv->lock, flags); |