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

Commit 2c4eabe2 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

phy: ti: dm816x: Fix the error handling path in 'dm816x_usb_phy_probe() 



[ Upstream commit f7eedcb8539ddcbb6fe7791f1b4ccf43f905c72f ]

Add an error handling path in the probe to release some resources, as
already done in the remove function.

Fixes: 609adde8 ("phy: Add a driver for dm816x USB PHY")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/ac5136881f6bdec50be19b3bf73b3bc1b15ef1f1.1622898974.git.christophe.jaillet@wanadoo.fr


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

drivers/phy/phy-dm816x-usb.c

+13 −4
Original line number Diff line number Diff line
@@ -246,19 +246,28 @@ static int dm816x_usb_phy_probe(struct platform_device *pdev) 


	pm_runtime_enable(phy->dev);

	generic_phy = devm_phy_create(phy->dev, NULL, &ops);

	if (IS_ERR(generic_phy))

		return PTR_ERR(generic_phy);

	if (IS_ERR(generic_phy)) {

		error = PTR_ERR(generic_phy);

		goto clk_unprepare;

	}



	phy_set_drvdata(generic_phy, phy);



	phy_provider = devm_of_phy_provider_register(phy->dev,

						     of_phy_simple_xlate);

	if (IS_ERR(phy_provider))

		return PTR_ERR(phy_provider);

	if (IS_ERR(phy_provider)) {

		error = PTR_ERR(phy_provider);

		goto clk_unprepare;

	}



	usb_add_phy_dev(&phy->phy);



	return 0;



clk_unprepare:

	pm_runtime_disable(phy->dev);

	clk_unprepare(phy->refclk);

	return error;

}



static int dm816x_usb_phy_remove(struct platform_device *pdev)