projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: bgmac: fix reversed checks for clock control flag
[linux-2.6-microblaze.git]
/
drivers
/
net
/
ethernet
/
broadcom
/
bgmac.c
diff --git
a/drivers/net/ethernet/broadcom/bgmac.c
b/drivers/net/ethernet/broadcom/bgmac.c
index
91cbf92
..
49f4caf
100644
(file)
--- a/
drivers/net/ethernet/broadcom/bgmac.c
+++ b/
drivers/net/ethernet/broadcom/bgmac.c
@@
-1049,9
+1049,9
@@
static void bgmac_enable(struct bgmac *bgmac)
mode = (bgmac_read(bgmac, BGMAC_DEV_STATUS) & BGMAC_DS_MM_MASK) >>
BGMAC_DS_MM_SHIFT;
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);
bgmac_set(bgmac, BCMA_CLKCTLST, BCMA_CLKCTLST_FORCEHT);
- if (
bgmac->feature_flags & BGMAC_FEAT_CLKCTLST
&& mode == 2)
+ if (
!(bgmac->feature_flags & BGMAC_FEAT_CLKCTLST)
&& mode == 2)
bgmac_cco_ctl_maskset(bgmac, 1, ~0,
BGMAC_CHIPCTL_1_RXC_DLL_BYPASS);
bgmac_cco_ctl_maskset(bgmac, 1, ~0,
BGMAC_CHIPCTL_1_RXC_DLL_BYPASS);