summaryrefslogtreecommitdiffstats
path: root/drivers/phy
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2015-04-08 07:30:15 +0800
committerKishon Vijay Abraham I <kishon@ti.com>2015-05-11 20:18:51 +0530
commitf83be4c3f69762e1fc736e375b04e5c22b3ddceb (patch)
treedd941aea71c750d2094f99bc26cace4e106b3295 /drivers/phy
parent2decb2682f80759f631c8332f9a2a34a02150a03 (diff)
downloadop-kernel-dev-f83be4c3f69762e1fc736e375b04e5c22b3ddceb.zip
op-kernel-dev-f83be4c3f69762e1fc736e375b04e5c22b3ddceb.tar.gz
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 <axel.lin@ingics.com> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Diffstat (limited to 'drivers/phy')
-rw-r--r--drivers/phy/phy-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index 3791838..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;
OpenPOWER on IntegriCloud