From 2d305834919ef3a18439566337fb41856e126864 Mon Sep 17 00:00:00 2001 From: Zhuo Wang Date: Fri, 15 Jun 2018 14:40:51 +0800 Subject: [PATCH] ethernet: fix reboot error PD#164611: fix error not support powerlow Change-Id: I9d65b25bebcfb7afccc590629c7865ed490440de Signed-off-by: Zhuo Wang --- drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c index a854e6c..6645b49 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c @@ -428,7 +428,11 @@ static int meson6_dwmac_suspend(struct device *dev) pin_ctrl = devm_pinctrl_get(dev); turnoff_tes = pinctrl_lookup_state (pin_ctrl, "internal_gpio_pins"); - pinctrl_select_state(pin_ctrl, turnoff_tes); + if (IS_ERR_OR_NULL(turnoff_tes)) + pr_info("Not support gpio low\n"); + else + pinctrl_select_state(pin_ctrl, turnoff_tes); + devm_pinctrl_put(pin_ctrl); pin_ctrl = NULL; dwmac_meson_disable_analog(dev); @@ -472,7 +476,12 @@ void meson6_dwmac_shutdown(struct platform_device *pdev) pin_ctrl = devm_pinctrl_get(&pdev->dev); turnoff_tes = pinctrl_lookup_state (pin_ctrl, "internal_gpio_pins"); - pinctrl_select_state(pin_ctrl, turnoff_tes); + if (IS_ERR_OR_NULL(turnoff_tes)) + pr_info("Not support gpio low\n"); + else + pinctrl_select_state(pin_ctrl, turnoff_tes); + + //pinctrl_select_state(pin_ctrl, turnoff_tes); devm_pinctrl_put(pin_ctrl); pin_ctrl = NULL; dwmac_meson_disable_analog(&pdev->dev); -- 2.7.4