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

Commit f83be4c3 authored by Axel Lin's avatar Axel Lin Committed by Kishon Vijay Abraham I
Browse files

phy: core: Fix error checking in (devm_)phy_optional_get 



Don't pass valid pointer to PTR_ERR, use PTR_ERR(phy) only when
IS_ERR(phy) is true.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parent 2decb268

drivers/phy/phy-core.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -530,7 +530,7 @@ struct phy *phy_optional_get(struct device *dev, const char *string) 
{

{

	struct phy *phy = phy_get(dev, string);

	struct phy *phy = phy_get(dev, string);





	if (PTR_ERR(phy) == -ENODEV)

	if (IS_ERR(phy) && (PTR_ERR(phy) == -ENODEV))

		phy = NULL;

		phy = NULL;





	return phy;

	return phy;
@@ -584,7 +584,7 @@ struct phy *devm_phy_optional_get(struct device *dev, const char *string) 
{

{

	struct phy *phy = devm_phy_get(dev, string);

	struct phy *phy = devm_phy_get(dev, string);





	if (PTR_ERR(phy) == -ENODEV)

	if (IS_ERR(phy) && (PTR_ERR(phy) == -ENODEV))

		phy = NULL;

		phy = NULL;





	return phy;

	return phy;