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

PATCH New Axel Lin 1 participant 1 message Apr 7, 2015 Generic PHY framework

lore

Share & tools

lore

Axel Lin

author

2015-04-07 23:30 UTC #0 lore raw

PATCH v2 1/1 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 Axel Lin <[email protected]>

---
 drivers/phy/phy-core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/phy/phy-core.c +2 -2

index 3791838f..63bc12d 100644
@@ -530,7 +530,7 @@ struct phy *phy_optional_get(struct device *dev, const char *string)
 {
 	struct phy *phy = phy_get(dev, string);
 
-	if (PTR_ERR(phy) == -ENODEV)
+	if (IS_ERR(phy) && (PTR_ERR(phy) == -ENODEV))
 		phy = NULL;
 
 	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);
 
-	if (PTR_ERR(phy) == -ENODEV)
+	if (IS_ERR(phy) && (PTR_ERR(phy) == -ENODEV))
 		phy = NULL;
 
 	return phy;

Signature · 1 line

1.9.1