diff options
| author | Joel Stanley <joel@jms.id.au> | 2022-01-14 07:26:38 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2022-01-14 07:26:45 +0300 |
| commit | a86c6a512f98e00938183ab1bb4504859a294433 (patch) | |
| tree | 4279e934970303f820d3df34af16b9c24b6b5d60 /drivers/reset | |
| parent | 2df0c7463236a6e19f020b0879285cac0e60c2f0 (diff) | |
| parent | d114b082bef784345bfac1e1d5c17257005284f2 (diff) | |
| download | linux-a86c6a512f98e00938183ab1bb4504859a294433.tar.xz | |
Merge tag 'v5.15.14' into dev-5.15
This is the 5.15.14 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/reset')
| -rw-r--r-- | drivers/reset/reset-rzg2l-usbphy-ctrl.c | 7 | ||||
| -rw-r--r-- | drivers/reset/tegra/reset-bpmp.c | 9 |
2 files changed, 7 insertions, 9 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); diff --git a/drivers/reset/tegra/reset-bpmp.c b/drivers/reset/tegra/reset-bpmp.c index 4c5bba52b105..24d3395964cc 100644 --- a/drivers/reset/tegra/reset-bpmp.c +++ b/drivers/reset/tegra/reset-bpmp.c @@ -20,7 +20,6 @@ static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc, struct tegra_bpmp *bpmp = to_tegra_bpmp(rstc); struct mrq_reset_request request; struct tegra_bpmp_message msg; - int err; memset(&request, 0, sizeof(request)); request.cmd = command; @@ -31,13 +30,7 @@ static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc, msg.tx.data = &request; msg.tx.size = sizeof(request); - err = tegra_bpmp_transfer(bpmp, &msg); - if (err) - return err; - if (msg.rx.ret) - return -EINVAL; - - return 0; + return tegra_bpmp_transfer(bpmp, &msg); } static int tegra_bpmp_reset_module(struct reset_controller_dev *rstc, |