diff options
author | Arnd Bergmann <arnd@arndb.de> | 2021-12-13 14:13:23 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2021-12-13 14:13:41 +0100 |
commit | 1e3dbfbbec52fa4eb427fb00ecf8f2cba57301e3 (patch) | |
tree | efe13b82cb9879b446b4c10c94b0df39572d7a1a | |
parent | 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 (diff) | |
parent | 69125b4b9440be015783312e1b8753ec96febde0 (diff) |
Merge tag 'reset-fixes-for-v5.16' of git://git.pengutronix.de/pza/linux into arm/fixes
Reset controller fixes for v5.16
Well, just one: revert commit c045ceb5a145 ("reset: tegra-bpmp: Handle
errors in BPMP response"), which exposed an issue with the Tegra194 HDA
controller reset. BPMP response error handling will be reinstated once
there's a fix for the HDA issue.
* tag 'reset-fixes-for-v5.16' of git://git.pengutronix.de/pza/linux:
reset: tegra-bpmp: Revert Handle errors in BPMP response
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | drivers/reset/tegra/reset-bpmp.c | 9 |
1 files changed, 1 insertions, 8 deletions
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, |