public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] phy: core: Fix error checking in (devm_)phy_optional_get
@ 2015-04-07 11:43 Axel Lin
  2015-04-07 14:21 ` Kishon Vijay Abraham I
  0 siblings, 1 reply; 3+ messages in thread
From: Axel Lin @ 2015-04-07 11:43 UTC (permalink / raw)
  To: Kishon Vijay Abraham I; +Cc: linux-kernel@vger.kernel.org

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

Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
 drivers/phy/phy-core.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index 3791838f..f112fff 100644
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -530,8 +530,10 @@ struct phy *phy_optional_get(struct device *dev, const char *string)
 {
 	struct phy *phy = phy_get(dev, string);
 
-	if (PTR_ERR(phy) == -ENODEV)
-		phy = NULL;
+	if (IS_ERR(phy)) {
+		if (PTR_ERR(phy) == -ENODEV)
+			phy = NULL;
+	}
 
 	return phy;
 }
@@ -584,8 +586,10 @@ 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)
-		phy = NULL;
+	if (IS_ERR(phy)) {
+		if (PTR_ERR(phy) == -ENODEV)
+			phy = NULL;
+	}
 
 	return phy;
 }
-- 
1.9.1




^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-04-07 23:33 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-07 11:43 [PATCH] phy: core: Fix error checking in (devm_)phy_optional_get Axel Lin
2015-04-07 14:21 ` Kishon Vijay Abraham I
2015-04-07 23:32   ` Axel Lin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox