From 96691d2fdc68d64156fa4b5eb0ef77fcb5e52aef Mon Sep 17 00:00:00 2001 From: August Date: Wed, 15 Aug 2018 17:44:31 +0800 Subject: [PATCH] Fix gmac regulator mismatch issue when suspend/resume --- lichee/linux-4.9/drivers/net/ethernet/allwinner/sunxi-gmac.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lichee/linux-4.9/drivers/net/ethernet/allwinner/sunxi-gmac.c b/lichee/linux-4.9/drivers/net/ethernet/allwinner/sunxi-gmac.c index 62b9754ee3..4c0c0a0808 100644 --- a/lichee/linux-4.9/drivers/net/ethernet/allwinner/sunxi-gmac.c +++ b/lichee/linux-4.9/drivers/net/ethernet/allwinner/sunxi-gmac.c @@ -1054,7 +1054,7 @@ static int geth_open(struct net_device *ndev) if (ret) goto err; - ret = sunxi_mac_reset((void *)priv->base, &sunxi_udelay, 10000); + ret = sunxi_mac_reset((void *)priv->base, &sunxi_udelay, 50000); if (ret) { netdev_err(ndev, "Initialize hardware error\n"); goto desc_err; @@ -1109,8 +1109,6 @@ err: if (priv->is_suspend) napi_enable(&priv->napi); - geth_power_off(priv); - return ret; }