diff --git a/[refs] b/[refs] index b2d52c8dbafe..e1787db08ef2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d9e9d09b78bd131f488bbd2746852a05bcf557f +refs/heads/master: 2d586ea6de0ffe3e119ed0f1d4cb0adeb6874cbc diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c b/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c index 3fbbbb46a360..f027d5076c7d 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c @@ -4051,6 +4051,7 @@ wlc_lcnphy_a1(phy_info_t *pi, int cal_type, int num_levels, int step_size_lg2) phy_c32 = kmalloc(sizeof(u16) * 20, GFP_ATOMIC); if (NULL == phy_c32) { + kfree(ptr); return; } phy_c26 = read_phy_reg(pi, 0x6da);