Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-09 23:00:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reset controller fixes for v5.16, part 2

Browse Source 
Fix pm_runtime_resume_and_get() error handling in the
 reset-rzg2l-usbphy-ctrl driver.
 -----BEGIN PGP SIGNATURE-----
 
 iI0EABYIADUWIQRRO6F6WdpH1R0vGibVhaclGDdiwAUCYdXQMRcccC56YWJlbEBw
 ZW5ndXRyb25peC5kZQAKCRDVhaclGDdiwCrJAQC/nW5YH9o0PuredqlUtha/Akpc
 jQmrDZOfHmrm8GOJiAD+OtRE1NHjgm6CXan0QYwa2Dbb+yYifvOZL/SLo5raAw8=
 =ScZk
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQJDBAABCgAtFiEElf+HevZ4QCAJmMQ+jBrnPN6EHHcFAmHWNUkPHG9sb2ZAbGl4
 b20ubmV0AAoJEIwa5zzehBx3b64P+wSxOSOinbkaY/QSj57rZAHdt05OPWjQc0+p
 A6cicMiOpcF+dxRp9ZNOmAv/ViZXsHfSnZg15/tzvWT9bsQcekXHTaeCpm8d4Ku9
 LvUS2X1LtnTH/E+I1/No+W9ljJ3sEkmLFigAAh2I7gSAHrba/RQNhv4oMisw4pNP
 SLZRYuju5MLfPg4wQ8nfkq6rwkNuqfHKueyWKu0R9507oNzXzuzTQcpuZvRPVbWL
 Gpi6QRfQeC06tPM/9nbaPCaGeG12opio8rhNnuLrWqRMQHVUUbQ+VmBTM1ZlDhpv
 8UNkW2AqXUrf0ijopzKzzKLWB5iNhPtWav3T+oTppGvB4Z7jYHUwjtotlYqI6uAQ
 VqtGmObxfnY0xx+RpXWEGuCFCd43AhqdNpR0X4miyh06E0fGpgQWCEbQSDRep/iJ
 tbpDR2cfD7JB2m1asYD+72NHqe53UgCXvgt/xf+gpdR2I2BVcQxj0YfieSZvS5Hq
 FY9OTMl1xZE3SUIPi1eZmZAeqmKRaj7ZCKslgqD+pfnWU/+WEGI4f/M30h/7BAK0
 vNvnJ44T6ozPshCfiHNl2L0z6XC0bA4mvi4z7gnuXRAFA71I5Eg9s1mYqwG3UDZU
 /4JKkzr7Al6BdXZZtXjkDsCK+agyhSa95ywNbUi7XqtD/C0qybVQFfwGqJQ+/HH8
 6M2wIqZj
 =/Jsy
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2022-01-05 16:18:15 -08:00
commit fde9ec3c1b
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/reset/reset-rzg2l-usbphy-ctrl.c
View File

@ -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);

9
drivers/reset/tegra/reset-bpmp.c
View File

@ -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,