summaryrefslogtreecommitdiffstats
path: root/drivers/phy
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2017-09-08 13:31:37 +0300
committerKishon Vijay Abraham I <kishon@ti.com>2017-09-26 17:02:49 +0530
commitc1c7acac0998ffcc9cd81e016a7d1b58b1afbb51 (patch)
tree7969e591a3890162246a8738225bfaca90de4cb1 /drivers/phy
parent17fb745d4acfe52f9ebb1ba2b10f2fcd796fb5ce (diff)
downloadlinux-stable-c1c7acac0998ffcc9cd81e016a7d1b58b1afbb51.tar.gz
linux-stable-c1c7acac0998ffcc9cd81e016a7d1b58b1afbb51.tar.bz2
linux-stable-c1c7acac0998ffcc9cd81e016a7d1b58b1afbb51.zip
phy: mvebu-cp110: checking for NULL instead of IS_ERR()
devm_ioremap_resource() never returns NULL, it only returns error pointers so this test needs to be changed. Fixes: d0438bd6aa09 ("phy: add the mvebu cp110 comphy driver") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Diffstat (limited to 'drivers/phy')
-rw-r--r--drivers/phy/marvell/phy-mvebu-cp110-comphy.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/phy/marvell/phy-mvebu-cp110-comphy.c b/drivers/phy/marvell/phy-mvebu-cp110-comphy.c
index e8ed7e3e6e23..89c887ea5557 100644
--- a/drivers/phy/marvell/phy-mvebu-cp110-comphy.c
+++ b/drivers/phy/marvell/phy-mvebu-cp110-comphy.c
@@ -586,8 +586,8 @@ static int mvebu_comphy_probe(struct platform_device *pdev)
return PTR_ERR(priv->regmap);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
priv->base = devm_ioremap_resource(&pdev->dev, res);
- if (!priv->base)
- return -ENOMEM;
+ if (IS_ERR(priv->base))
+ return PTR_ERR(priv->base);
for_each_available_child_of_node(pdev->dev.of_node, child) {
struct mvebu_comphy_lane *lane;