diff --git a/[refs] b/[refs]
index e58e90d468fb..17f7f56fbfe3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb10e59111870a51f0eb7bcc046b6b7eb39dfa3e
+refs/heads/master: fa0ace7fd3b9cfbe3b2d117af7eac4a132558a1b
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/srom.c b/trunk/drivers/staging/brcm80211/brcmsmac/srom.c
index 5b5306a510fd..31aa84d4aff4 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/srom.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/srom.c
@@ -1287,12 +1287,10 @@ static int initvars_srom_pci(struct si_pub *sih, void *curmap, char **vars,
 		*vp++ = '\0';
 
 		err = initvars_table(base, vp, vars, count);
+		kfree(base);
 	}
 
 errout:
-	if (base)
-		kfree(base);
-
 	kfree(srom);
 	return err;
 }