drm/bridge: analogix_dp: Fix clk-disable removal
Subsystems (3)
PATCH 1/1 drm/bridge: analogix_dp: Fix clk-disable removal
Commit 6579a03e68ff ("drm/bridge: analogix_dp: Remove the unnecessary calls to clk_disable_unprepare() during probing") removed the mismatched clock_disable calls from analogix_dp_probe.
But that patch was created and sent before
commit e5e9fa9f7aad ("drm/bridge: analogix_dp: Add support to get panel from the DP AUX bus") was merged, so couldn't know about this change.
So in the original patch the last change is
if (ret) {
dev_err(&pdev->dev, "failed to request irq\n");
- goto err_disable_clk;
+ return ERR_PTR(ret);
}
disable_irq(dp->irq);
return dp;-
-err_disable_clk:
- clk_disable_unprepare(dp->clock);
- return ERR_PTR(ret);
}
EXPORT_SYMBOL_GPL(analogix_dp_probe);
the analogix_dp_core.c actually now has the runtime-pm handling between disable_irq() and return do introducing another goto err_clk_disable there.
So remove that one too and return an error pointer, to not create build breakage.
---
When I reviewed the original patch, I failed to see that difference :-( But I do wonder how dim was able to apply the original patch.
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +1 -1
@@ -1586,7 +1586,7 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)pm_runtime_set_autosuspend_delay (dp->dev,100 ); ret =devm_pm_runtime_enable (dp->dev);if (ret) - goto err_disable_clk; +return ERR_PTR (ret);return dp; }
Signature · 1 line
2.47.2
Quoted 27 lines · Heiko Stuebner
Commit
6579a03e68ff("drm/bridge:analogix_dp: Remove the unnecessary calls toclk_disable_unprepare()during probing") removed the mismatchedclock_disablecalls fromanalogix_dp_probe.But that patch was created and sent before
commite5e9fa9f7aad("drm/bridge:analogix_dp: Add support to get panel from the DP AUX bus") was merged, so couldn't know about this change.So in the original patch the last change is
if (ret) { dev_err(&pdev->dev, "failed to request irq\n");(quoted diff) +1
-5- goto err_disable_clk; + return ERR_PTR(ret); } disable_irq(dp->irq); return dp; - -err_disable_clk: - clk_disable_unprepare(dp->clock); - return ERR_PTR(ret); } EXPORT_SYMBOL_GPL(analogix_dp_probe);the
analogix_dp_core.cactually now has the runtime-pm handling betweendisable_irq()and return do introducing another gotoerr_clk_disablethere.
Quoted 9 lines
So remove that one too and return an error pointer, to not create build breakage.
Fixes 6579a03e68ff ("drm/bridge: analogix_dp: Remove the unnecessary calls to clk_disable_unprepare() during probing")Signed-off-by Heiko Stuebner <[email protected]>---
When I reviewed the original patch, I failed to see that difference :-( But I do wonder how dim was able to apply the original patch.
Signature · 2 lines
With best wishes Dmitry
Quoted 24 lines · Heiko Stuebner
Commit
6579a03e68ff("drm/bridge:analogix_dp: Remove the unnecessary calls toclk_disable_unprepare()during probing") removed the mismatchedclock_disablecalls fromanalogix_dp_probe.But that patch was created and sent before
commite5e9fa9f7aad("drm/bridge:analogix_dp: Add support to get panel from the DP AUX bus") was merged, so couldn't know about this change.So in the original patch the last change is
if (ret) { dev_err(&pdev->dev, "failed to request irq\n");(quoted diff) +1
-5- goto err_disable_clk; + return ERR_PTR(ret); } disable_irq(dp->irq); return dp; - -err_disable_clk: - clk_disable_unprepare(dp->clock); - return ERR_PTR(ret);}
EXPORT_SYMBOL_GPL(analogix_dp_probe);
Quoted 8 lines
the
analogix_dp_core.cactually now has the runtime-pm handling betweendisable_irq()and return do introducing another gotoerr_clk_disablethere.So remove that one too and return an error pointer, to not create build breakage.
Fixes 6579a03e68ff ("drm/bridge: analogix_dp: Remove the unnecessary calls to clk_disable_unprepare() during probing")Signed-off-by Heiko Stuebner <[email protected]>
Dmitry, maybe you have to enable a config in your build tests so we don't have broken builds?
Lucas De Marchi
Dmitry Baryshkov
AppliedQuoted 9 lines · Heiko Stuebner
Commit
6579a03e68ff("drm/bridge:analogix_dp: Remove the unnecessary calls toclk_disable_unprepare()during probing") removed the mismatchedclock_disablecalls fromanalogix_dp_probe.But that patch was created and sent before
commite5e9fa9f7aad("drm/bridge:analogix_dp: Add support to get panel from the DP AUX bus") was merged, so couldn't know about this change.[...]
Applied to drm-misc-next-fixes, thanks!
[1/1] drm/bridge: analogix_dp: Fix clk-disable removal
commit: fd03f82a026cc03cb8051a8c6487c99f96c9029f
Best regards,
Signature · 1 line
Dmitry Baryshkov <[email protected]>