Skip to contentSkip to conversation

drm/bridge: nwl-dsi: Fix PM disable depth imbalance in nwl_dsi_probe

PATCH In review Miaoqian Lin 2 participants 2 messages Jan 5, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/bridge: nwl-dsi: Fix PM disable depth imbalance in nwl_dsi_probe

The pm_runtime_enable will increase power disable depth. Thus a pairing decrement is needed on the error handling path to keep it balanced according to context.

Fixes 44cfc62 ("drm/bridge: Add NWL MIPI DSI host controller support")
---
 drivers/gpu/drm/bridge/nwl-dsi.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/bridge/nwl-dsi.c +1 -0
index a7389a0facfb..fc3ad9fab867 100644
@@ -1206,6 +1206,7 @@ static int nwl_dsi_probe(struct platform_device *pdev)
 
 	ret = nwl_dsi_select_input(dsi);
 	if (ret < 0) {
+		pm_runtime_disable(dev);
 		mipi_dsi_host_unregister(&dsi->dsi_host);
 		return ret;
 	}
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#1 lore raw

Hey Miaoqian,

Thanks for submitting this patch!

Quoted 6 lines · Miaoqian Lin

The pm_runtime_enable will increase power disable depth. Thus a pairing decrement is needed on the error handling path to keep it balanced according to context.

Fixes 44cfc62 ("drm/bridge: Add NWL MIPI DSI host controller support")

In the future, please use 12 chars of the hash. I'll fix it this time, but please use 12 characters going forward.

Quoted 18 lines
---
 drivers/gpu/drm/bridge/nwl-dsi.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/bridge/nwl-dsi.c +1 -1
index a7389a0facfb..fc3ad9fab867 100644
@@ -1206,6 +1206,7 @@ static int nwl_dsi_probe(struct platform_device *pdev)
 
        ret = nwl_dsi_select_input(dsi);
        if (ret < 0) {
+               pm_runtime_disable(dev);
                mipi_dsi_host_unregister(&dsi->dsi_host);
                return ret;
        }
--
Quoted 2 lines

2.17.1

Fixed commit hash length, added my r-b and applied to drm-misc-next.