Skip to content

Commit 4af1474

Browse files
Jon Masondavem330
Jon Mason
authored and
davem330
committed
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: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Jon Mason <jon.mason@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent d35c99f commit 4af1474

File tree

1 file changed

+1
-1
lines changed
  • drivers/net/ethernet/broadcom

1 file changed

+1
-1
lines changed

‎drivers/net/ethernet/broadcom/bgmac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1046,7 +1046,7 @@ static void bgmac_enable(struct bgmac *bgmac)
10461046

10471047
mode = (bgmac_read(bgmac, BGMAC_DEV_STATUS) & BGMAC_DS_MM_MASK) >>
10481048
BGMAC_DS_MM_SHIFT;
1049-
if (bgmac->feature_flags & BGMAC_FEAT_CLKCTLST || mode != 0)
1049+
if (!(bgmac->feature_flags & BGMAC_FEAT_CLKCTLST) || mode != 0)
10501050
bgmac_set(bgmac, BCMA_CLKCTLST, BCMA_CLKCTLST_FORCEHT);
10511051
if (bgmac->feature_flags & BGMAC_FEAT_CLKCTLST && mode == 2)
10521052
bgmac_cco_ctl_maskset(bgmac, 1, ~0,

0 commit comments

Comments
 (0)