diff options
| author | Joel Stanley <joel@jms.id.au> | 2022-04-28 04:48:27 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2022-04-28 04:48:30 +0300 |
| commit | 49caedb668e476c100d727f2174724e0610a2b92 (patch) | |
| tree | 7169ad544c5c1aa0303104785f9c4bb377198030 /drivers/reset | |
| parent | bec70691aa671f98adc78960c080f41f28c7040f (diff) | |
| parent | 45451e8015a91de5d1a512c3e3d7373bbcb58fb0 (diff) | |
| download | linux-49caedb668e476c100d727f2174724e0610a2b92.tar.xz | |
Merge tag 'v5.15.36' into dev-5.15
This is the 5.15.36 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 | 4 | ||||
| -rw-r--r-- | drivers/reset/tegra/reset-bpmp.c | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/drivers/reset/reset-rzg2l-usbphy-ctrl.c b/drivers/reset/reset-rzg2l-usbphy-ctrl.c index 1e8315038850..a8dde4606360 100644 --- a/drivers/reset/reset-rzg2l-usbphy-ctrl.c +++ b/drivers/reset/reset-rzg2l-usbphy-ctrl.c @@ -121,7 +121,9 @@ static int rzg2l_usbphy_ctrl_probe(struct platform_device *pdev) return dev_err_probe(dev, PTR_ERR(priv->rstc), "failed to get reset\n"); - reset_control_deassert(priv->rstc); + error = reset_control_deassert(priv->rstc); + if (error) + return error; priv->rcdev.ops = &rzg2l_usbphy_ctrl_reset_ops; priv->rcdev.of_reset_n_cells = 1; diff --git a/drivers/reset/tegra/reset-bpmp.c b/drivers/reset/tegra/reset-bpmp.c index 24d3395964cc..4c5bba52b105 100644 --- a/drivers/reset/tegra/reset-bpmp.c +++ b/drivers/reset/tegra/reset-bpmp.c @@ -20,6 +20,7 @@ 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; @@ -30,7 +31,13 @@ static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc, msg.tx.data = &request; msg.tx.size = sizeof(request); - return tegra_bpmp_transfer(bpmp, &msg); + err = tegra_bpmp_transfer(bpmp, &msg); + if (err) + return err; + if (msg.rx.ret) + return -EINVAL; + + return 0; } static int tegra_bpmp_reset_module(struct reset_controller_dev *rstc, |