From 93a069a4d0521060f6a983b98feb97d64060da67 Mon Sep 17 00:00:00 2001 From: Yizhou Jiang Date: Mon, 8 May 2017 16:50:12 +0800 Subject: [PATCH] eth: fix ethernet function failure PD#143005: eth failed when suspend/resume Change-Id: I119469b295f2f588a5f5952fbae3d6ececb082cc Signed-off-by: Yizhou Jiang --- drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c index 7652ab33dd99..624f01c2f31c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c @@ -36,7 +36,9 @@ static void meson6_dwmac_fix_mac_speed(void *priv, unsigned int speed) { struct meson_dwmac *dwmac = priv; unsigned int val; - +#ifdef CONFIG_AMLOGIC_ETH_PRIVE + return; +#endif val = readl(dwmac->reg); switch (speed) {