Skip to content

Commit 7196061

Browse files
tmlindvinodkoul
authored andcommitted
phy: mapphone-mdm6600: Fix runtime disable on probe
Commit d644e0d ("phy: mapphone-mdm6600: Fix PM error handling in phy_mdm6600_probe") caused a regression where we now unconditionally disable runtime PM at the end of the probe while it is only needed on errors. Cc: Ivaylo Dimitrov <[email protected]> Cc: Merlijn Wajer <[email protected]> Cc: Miaoqian Lin <[email protected]> Cc: Pavel Machek <[email protected]> Reviewed-by: Sebastian Reichel <[email protected]> Fixes: d644e0d ("phy: mapphone-mdm6600: Fix PM error handling in phy_mdm6600_probe") Signed-off-by: Tony Lindgren <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Vinod Koul <[email protected]>
1 parent 0bb80ec commit 7196061

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

drivers/phy/motorola/phy-mapphone-mdm6600.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -627,10 +627,12 @@ static int phy_mdm6600_probe(struct platform_device *pdev)
627627
pm_runtime_put_autosuspend(ddata->dev);
628628

629629
cleanup:
630-
if (error < 0)
630+
if (error < 0) {
631631
phy_mdm6600_device_power_off(ddata);
632-
pm_runtime_disable(ddata->dev);
633-
pm_runtime_dont_use_autosuspend(ddata->dev);
632+
pm_runtime_disable(ddata->dev);
633+
pm_runtime_dont_use_autosuspend(ddata->dev);
634+
}
635+
634636
return error;
635637
}
636638

0 commit comments

Comments
 (0)