diff options
| author |   Wei Yongjun <weiyongjun1@huawei.com> | 2018-10-10 02:00:24 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-10-10 22:54:26 -0700 |
| commit | 9047fa5d32942acbc017d2c2e2d0af3e6ce833ed (patch) | |
| tree | ddd1613503b2b6499dd3bd75f5816493c54f1f51 /drivers/phy/mscc | |
| parent | Merge branch 'net-dsa-bcm_sf2-Couple-of-fixes' (diff) | |
| download | linux-dev-9047fa5d32942acbc017d2c2e2d0af3e6ce833ed.tar.xz linux-dev-9047fa5d32942acbc017d2c2e2d0af3e6ce833ed.zip | |
phy: phy-ocelot-serdes: fix return value check in serdes_probe()
In case of error, the function syscon_node_to_regmap() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should
be replaced with IS_ERR().
Fixes: 51f6b410fc22 ("phy: add driver for Microsemi Ocelot SerDes muxing")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Reviewed-by: Quentin Schulz <quentin.schulz@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/phy/mscc')
| -rw-r--r-- | drivers/phy/mscc/phy-ocelot-serdes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/phy/mscc/phy-ocelot-serdes.c b/drivers/phy/mscc/phy-ocelot-serdes.c index 8936abd22f0f..b2be54680cf7 100644 --- a/drivers/phy/mscc/phy-ocelot-serdes.c +++ b/drivers/phy/mscc/phy-ocelot-serdes.c @@ -257,8 +257,8 @@ static int serdes_probe(struct platform_device *pdev) ctrl->dev = &pdev->dev; ctrl->regs = syscon_node_to_regmap(pdev->dev.parent->of_node); - if (!ctrl->regs) - return -ENODEV; + if (IS_ERR(ctrl->regs)) + return PTR_ERR(ctrl->regs); for (i = 0; i <= SERDES_MAX; i++) { ret = serdes_phy_create(ctrl, i, &ctrl->phys[i]); |