lkml.org 
[lkml]   [2015]   [Apr]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] phy: core: Fix error checking in (devm_)phy_optional_get
From
Date
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




\
 
 \ /
  Last update: 2015-04-07 14:21    [W:0.033 / U:0.580 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site