Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 259534
b: refs/heads/master
c: 73d924b
h: refs/heads/master
v: v3
  • Loading branch information
Arend van Spriel authored and Greg Kroah-Hartman committed Jun 28, 2011
1 parent abcea1d commit f4d45af
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 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: 835ef44c60bf36411dfaf37b43f5058214bbc016
refs/heads/master: 73d924bfe384af21b67f25698bde925f9b02e795
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c
Original file line number Diff line number Diff line change
Expand Up @@ -23456,7 +23456,7 @@ wlc_phy_est_tonepwr_nphy(phy_info_t *pi, s32 *qdBm_pwrbuf, u8 num_samps)

tssi_type =
CHSPEC_IS5G(pi->radio_chanspec) ?
(u8)NPHY_RSSI_SEL_TSSI_5G:(u8)NPHY_RSSI_SEL_TSSI_2G;
(u8)NPHY_RSSI_SEL_TSSI_5G : (u8)NPHY_RSSI_SEL_TSSI_2G;

wlc_phy_poll_rssi_nphy(pi, tssi_type, rssi_buf, num_samps);

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/brcm80211/brcmsmac/srom.c
Original file line number Diff line number Diff line change
Expand Up @@ -1318,9 +1318,9 @@ static int initvars_srom_pci(struct si_pub *sih, void *curmap, char **vars,
vp = b.buf;
*vp++ = '\0';

err = initvars_table(base, vp, vars, count);
err = initvars_table(base, vp, vars, count);

errout:
errout:
if (base)
kfree(base);

Expand Down

0 comments on commit f4d45af

Please sign in to comment.