From b2b4ab24bc74112b56961f876b0400e00e775702 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 30 Jun 2012 15:16:15 +0200 Subject: [PATCH] --- yaml --- r: 315339 b: refs/heads/master c: 0d3b9dd1a3608eadbd2db157f44bbdd11cf63745 h: refs/heads/master i: 315337: b18e163e0fa2e24fccbf27f918a210a136d4efff 315335: fcb3421e0569f6c52a0056c6614d000177c2230e v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/brcm80211/brcmsmac/main.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4b9923d09a85..0285a04706c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5fed0c1e48ca6c153e33e63aef406b4ef97cd95 +refs/heads/master: 0d3b9dd1a3608eadbd2db157f44bbdd11cf63745 diff --git a/trunk/drivers/net/wireless/brcm80211/brcmsmac/main.c b/trunk/drivers/net/wireless/brcm80211/brcmsmac/main.c index 8bad8b6dad9d..547ae5bca567 100644 --- a/trunk/drivers/net/wireless/brcm80211/brcmsmac/main.c +++ b/trunk/drivers/net/wireless/brcm80211/brcmsmac/main.c @@ -1942,7 +1942,8 @@ static bool brcms_b_radio_read_hwdisabled(struct brcms_hardware *wlc_hw) * accesses phyreg throughput mac. This can be skipped since * only mac reg is accessed below */ - flags |= SICF_PCLKE; + if (D11REV_GE(wlc_hw->corerev, 18)) + flags |= SICF_PCLKE; /* * TODO: test suspend/resume @@ -2023,7 +2024,8 @@ void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags) * phyreg throughput mac, AND phy_reset is skipped at early stage when * band->pi is invalid. need to enable PHY CLK */ - flags |= SICF_PCLKE; + if (D11REV_GE(wlc_hw->corerev, 18)) + flags |= SICF_PCLKE; /* * reset the core