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: 5ec5582343
("net: stmmac: add clocks management for gmac driver")
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
13a6f31539
Коммит
b3dcb31277
|
@ -6191,12 +6191,6 @@ static int stmmac_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vid
|
||||||
bool is_double = false;
|
bool is_double = false;
|
||||||
int ret;
|
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)
|
if (be16_to_cpu(proto) == ETH_P_8021AD)
|
||||||
is_double = true;
|
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;
|
bool is_double = false;
|
||||||
int ret;
|
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)
|
if (be16_to_cpu(proto) == ETH_P_8021AD)
|
||||||
is_double = true;
|
is_double = true;
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче