From 7831a0f21ca575dad0517b026303a2260404c024 Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Tue, 3 May 2011 11:35:41 +0200 Subject: [PATCH] --- yaml --- r: 249324 b: refs/heads/master c: 2d1a826db7f73692e6895455f5d9c297447b5025 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmsmac/wlc_pmu.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 46596f816a50..17d2d8a28d23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ac71a1dda960b2166dd04bcf6c3d606cb7903bb +refs/heads/master: 2d1a826db7f73692e6895455f5d9c297447b5025 diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_pmu.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_pmu.c index cd42a77585f9..2c3d42fd5e6a 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_pmu.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_pmu.c @@ -1626,7 +1626,8 @@ void si_pmu_res_init(si_t *sih) pmu_res_updown_table_sz = 0; } else { pmu_res_updown_table = bcm4329_res_updown; - pmu_res_updown_table_sz = ARRAY_SIZE(bcm4329_res_updown); + pmu_res_updown_table_sz = + ARRAY_SIZE(bcm4329_res_updown); } /* Optimize resources dependencies */ pmu_res_depend_table = bcm4329_res_depend; @@ -1758,15 +1759,13 @@ void si_pmu_res_init(si_t *sih) /* Program max resource mask */ - if (max_mask) { + if (max_mask) W_REG(&cc->max_res_mask, max_mask); - } /* Program min resource mask */ - if (min_mask) { + if (min_mask) W_REG(&cc->min_res_mask, min_mask); - } /* Add some delay; allow resources to come up and settle. */ mdelay(2);