Commit b3dcb312 authored by Joakim Zhang's avatar Joakim Zhang Committed by David S. Miller
Browse files

net: stmmac: correct clocks enabled in stmmac_vlan_rx_kill_vid() 



This should be a mistake to fix conflicts when removing RFC tag to
repost the patch.

Fixes: 5ec55823 ("net: stmmac: add clocks management for gmac driver")
Signed-off-by: default avatarJoakim Zhang <qiangqing.zhang@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 13a6f315

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+6 −6
Original line number Diff line number Diff line
@@ -6191,12 +6191,6 @@ static int stmmac_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vid 
	bool is_double = false;

	int ret;



	ret = pm_runtime_get_sync(priv->device);

	if (ret < 0) {

		pm_runtime_put_noidle(priv->device);

		return ret;

	}



	if (be16_to_cpu(proto) == ETH_P_8021AD)

		is_double = true;
@@ -6222,6 +6216,12 @@ static int stmmac_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vi 
	bool is_double = false;

	int ret;



	ret = pm_runtime_get_sync(priv->device);

	if (ret < 0) {

		pm_runtime_put_noidle(priv->device);

		return ret;

	}



	if (be16_to_cpu(proto) == ETH_P_8021AD)

		is_double = true;