public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] phy: core: Fix error checking in (devm_)phy_optional_get
@ 2015-04-07 23:30 Axel Lin
  0 siblings, 0 replies; only message in thread
From: Axel Lin @ 2015-04-07 23:30 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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index 3791838f..63bc12d 100644
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -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;
-- 
1.9.1




^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2015-04-07 23:30 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-07 23:30 [PATCH v2] phy: core: Fix error checking in (devm_)phy_optional_get Axel Lin

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