Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4af1474e authored by Jon Mason's avatar Jon Mason Committed by David S. Miller
Browse files

net: bgmac: Fix errant feature flag check 



During the conversion to the feature flags, a check against
ci->id != BCMA_CHIP_ID_BCM47162
became
bgmac->feature_flags & BGMAC_FEAT_CLKCTLS
instead of
!(bgmac->feature_flags & BGMAC_FEAT_CLKCTLS)

Reported-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJon Mason <jon.mason@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d35c99ff

drivers/net/ethernet/broadcom/bgmac.c

+1 −1
Original line number Diff line number Diff line
@@ -1046,7 +1046,7 @@ static void bgmac_enable(struct bgmac *bgmac) 


	mode = (bgmac_read(bgmac, BGMAC_DEV_STATUS) & BGMAC_DS_MM_MASK) >>

		BGMAC_DS_MM_SHIFT;

	if (bgmac->feature_flags & BGMAC_FEAT_CLKCTLST || mode != 0)

	if (!(bgmac->feature_flags & BGMAC_FEAT_CLKCTLST) || mode != 0)

		bgmac_set(bgmac, BCMA_CLKCTLST, BCMA_CLKCTLST_FORCEHT);

	if (bgmac->feature_flags & BGMAC_FEAT_CLKCTLST && mode == 2)

		bgmac_cco_ctl_maskset(bgmac, 1, ~0,