Commit 9e208ccf authored Aug 29, 2019 by Chen-Yu Tsai Committed by Greg Kroah-Hartman Sep 10, 2019

net: stmmac: dwmac-rk: Don't fail if phy regulator is absent



[ Upstream commit 3b25528e1e355c803e73aa326ce657b5606cda73 ]

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: 2e12f536 ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent a794b0ea

drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -771,10 +771,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);