diff options
| author |   Jon Mason <jon.mason@broadcom.com> | 2016-10-05 15:36:49 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-10-06 20:55:52 -0400 |
| commit | 4af1474e6198b10fee7bb20e81f7e033ad1b586c (patch) | |
| tree | 4ad51be7ee5b47cf7c0ad2dfb2b9a33ce751e9c0 /drivers/net/ethernet/broadcom | |
| parent | netlink: do not enter direct reclaim from netlink_dump() (diff) | |
| download | linux-dev-4af1474e6198b10fee7bb20e81f7e033ad1b586c.tar.xz linux-dev-4af1474e6198b10fee7bb20e81f7e033ad1b586c.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/broadcom')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bgmac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c index 6ea0e5ff1e44..856379cbb402 100644 --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c @@ -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, |