From 5a74623239b6b29af9f0b0b6afb780584d0058df Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Tue, 3 May 2011 11:35:36 +0200
Subject: [PATCH] --- yaml --- r: 249319 b: refs/heads/master c:
 7754116bab5b69491dbb6eb320e59b244624df63 h: refs/heads/master i:   249317:
 36180603c45bb4572122a4c365031ef839b64875   249315:
 320fafe02c901620b99f7cdd900e87cff49b4d89   249311:
 e01c5993830dd31f2a65207105d2c6d558154ecb v: v3

---
 [refs]                                                     | 2 +-
 trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c | 2 +-
 trunk/drivers/staging/brcm80211/util/hndpmu.c              | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7b7c718c6734..9aeb04a6f61e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da065a5c524c0ea2589d12f69884b2f8305dc6d4
+refs/heads/master: 7754116bab5b69491dbb6eb320e59b244624df63
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c b/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c
index 9f5ee40b2edb..4e7a20aaa761 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c
@@ -5053,7 +5053,7 @@ bool wlc_phy_attach_lcnphy(phy_info_t *pi)
 		pi->hwpwrctrl_capable = true;
 	}
 
-	pi->xtalfreq = si_alp_clock(pi->sh->sih);
+	pi->xtalfreq = si_pmu_alp_clock(pi->sh->sih);
 	pi_lcn->lcnphy_papd_rxGnCtrl_init = 0;
 
 	pi->pi_fptr.init = wlc_phy_init_lcnphy;
diff --git a/trunk/drivers/staging/brcm80211/util/hndpmu.c b/trunk/drivers/staging/brcm80211/util/hndpmu.c
index ffa2e2d55d58..566e0304cb84 100644
--- a/trunk/drivers/staging/brcm80211/util/hndpmu.c
+++ b/trunk/drivers/staging/brcm80211/util/hndpmu.c
@@ -1425,6 +1425,9 @@ u32 si_pmu_alp_clock(si_t *sih)
 #ifdef BCMDBG
 	char chn[8];
 #endif
+	/* bail out with default */
+	if (!PMUCTL_ENAB(sih))
+		return clock;
 
 	/* Remember original core before switch to chipc */
 	origidx = si_coreidx(sih);