The source file used si_alp_clock to determine crystal frequency. It now uses the si_pmu_alp_clock call instead to remove dependency from siutils functionality. Reviewed-by: Henry Ptasinski <henryp@xxxxxxxxxxxx> Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx> --- .../staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c | 2 +- drivers/staging/brcm80211/util/hndpmu.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c index a5a7bb8..e2d468e 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c @@ -5071,7 +5071,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); ASSERT(0 == (pi->xtalfreq % 1000)); pi_lcn->lcnphy_papd_rxGnCtrl_init = 0; diff --git a/drivers/staging/brcm80211/util/hndpmu.c b/drivers/staging/brcm80211/util/hndpmu.c index 6317b33..a6cee33 100644 --- a/drivers/staging/brcm80211/util/hndpmu.c +++ b/drivers/staging/brcm80211/util/hndpmu.c @@ -1455,6 +1455,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; ASSERT(sih->cccaps & CC_CAP_PMU); -- 1.7.1 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
