Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4db06513 authored by Tony Lindgren's avatar Tony Lindgren Committed by Greg Kroah-Hartman
Browse files

phy: mapphone-mdm6600: Fix runtime disable on probe 



[ Upstream commit 719606154c7033c068a5d4c1dc5f9163b814b3c8 ]

Commit d644e0d79829 ("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 <ivo.g.dimitrov.75@gmail.com>
Cc: Merlijn Wajer <merlijn@wizzup.org>
Cc: Miaoqian Lin <linmq006@gmail.com>
Cc: Pavel Machek <pavel@ucw.cz>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Fixes: d644e0d79829 ("phy: mapphone-mdm6600: Fix PM error handling in phy_mdm6600_probe")
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Link: https://lore.kernel.org/r/20230913060433.48373-1-tony@atomide.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 083ff5b5

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

+5 −3
Original line number Diff line number Diff line
@@ -626,10 +626,12 @@ static int phy_mdm6600_probe(struct platform_device *pdev) 
	pm_runtime_put_autosuspend(ddata->dev);



cleanup:

	if (error < 0)

	if (error < 0) {

		phy_mdm6600_device_power_off(ddata);

		pm_runtime_disable(ddata->dev);

		pm_runtime_dont_use_autosuspend(ddata->dev);

	}



	return error;

}