From: Arend van Spriel <arend@broadcom.com>
Date: Wed, 29 Jun 2011 23:46:28 +0000 (-0700)
Subject: staging: brcm80211: minor cleanup in initvars_srom_pci()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=fa0ace7fd3b9cfbe3b2d117af7eac4a132558a1b;p=deliverable%2Flinux.git

staging: brcm80211: minor cleanup in initvars_srom_pci()

The error handling code labelled with errout: did a conditional kfree(). The
last error jump to the label is upon failure of the kmalloc() for which the
conditional kfree() is done. Therefor, the kfree is moved before the error
label and done unconditionally.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/brcm80211/brcmsmac/srom.c b/drivers/staging/brcm80211/brcmsmac/srom.c
index 5b5306a510fd..31aa84d4aff4 100644
--- a/drivers/staging/brcm80211/brcmsmac/srom.c
+++ b/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;
 }