Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 249324
b: refs/heads/master
c: 2d1a826
h: refs/heads/master
v: v3
  • Loading branch information
Arend van Spriel authored and Greg Kroah-Hartman committed May 3, 2011
1 parent 46b5155 commit 7831a0f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5ac71a1dda960b2166dd04bcf6c3d606cb7903bb
refs/heads/master: 2d1a826db7f73692e6895455f5d9c297447b5025
9 changes: 4 additions & 5 deletions trunk/drivers/staging/brcm80211/brcmsmac/wlc_pmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 7831a0f

Please sign in to comment.