diff --git a/[refs] b/[refs] index e2a6622b6ffb..f14fa674029e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 835ef44c60bf36411dfaf37b43f5058214bbc016 +refs/heads/master: 73d924bfe384af21b67f25698bde925f9b02e795 diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c b/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c index bc5da6046882..696825ffde4a 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c @@ -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); diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/srom.c b/trunk/drivers/staging/brcm80211/brcmsmac/srom.c index 8aa6d015ef36..1117f91dc0d7 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/srom.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/srom.c @@ -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);