diff options
| author | Chen-Yu Tsai <wens@csie.org> | 2019-08-29 11:17:24 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-08-30 14:16:26 -0700 |
| commit | 3b25528e1e355c803e73aa326ce657b5606cda73 (patch) | |
| tree | 86a9730082fb4c30a82db46b924fad4ced3c36ee | |
| parent | b6b4dc4c1fa7f1c99398e7dc85758049645e9588 (diff) | |
| download | linux-3b25528e1e355c803e73aa326ce657b5606cda73.tar.gz | |
net: stmmac: dwmac-rk: Don't fail if phy regulator is absent
The devicetree binding lists the phy phy as optional. As such, the
driver should not bail out if it can't find a regulator. Instead it
should just skip the remaining regulator related code and continue
on normally.
Skip the remainder of phy_power_on() if a regulator supply isn't
available. This also gets rid of the bogus return code.
Fixes: 2e12f536635f ("net: stmmac: dwmac-rk: Use standard devicetree property for phy regulator")
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index 4644b2aeeba1cd..e2e469c37a4d07 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -1194,10 +1194,8 @@ static int phy_power_on(struct rk_priv_data *bsp_priv, bool enable) int ret; struct device *dev = &bsp_priv->pdev->dev; - if (!ldo) { - dev_err(dev, "no regulator found\n"); - return -1; - } + if (!ldo) + return 0; if (enable) { ret = regulator_enable(ldo); |