diff options
| author | Axel Lin <axel.lin@ingics.com> | 2015-04-07 19:30:15 -0400 |
|---|---|---|
| committer | Kishon Vijay Abraham I <kishon@ti.com> | 2015-05-11 10:48:51 -0400 |
| commit | f83be4c3f69762e1fc736e375b04e5c22b3ddceb (patch) | |
| tree | dd941aea71c750d2094f99bc26cace4e106b3295 | |
| parent | 2decb2682f80759f631c8332f9a2a34a02150a03 (diff) | |
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>
| -rw-r--r-- | drivers/phy/phy-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c index 3791838f4bd4..63bc12d7a73e 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) | |||
| 530 | { | 530 | { |
| 531 | struct phy *phy = phy_get(dev, string); | 531 | struct phy *phy = phy_get(dev, string); |
| 532 | 532 | ||
| 533 | if (PTR_ERR(phy) == -ENODEV) | 533 | if (IS_ERR(phy) && (PTR_ERR(phy) == -ENODEV)) |
| 534 | phy = NULL; | 534 | phy = NULL; |
| 535 | 535 | ||
| 536 | return phy; | 536 | return phy; |
| @@ -584,7 +584,7 @@ struct phy *devm_phy_optional_get(struct device *dev, const char *string) | |||
| 584 | { | 584 | { |
| 585 | struct phy *phy = devm_phy_get(dev, string); | 585 | struct phy *phy = devm_phy_get(dev, string); |
| 586 | 586 | ||
| 587 | if (PTR_ERR(phy) == -ENODEV) | 587 | if (IS_ERR(phy) && (PTR_ERR(phy) == -ENODEV)) |
| 588 | phy = NULL; | 588 | phy = NULL; |
| 589 | 589 | ||
| 590 | return phy; | 590 | return phy; |