Browse Source

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>
Arend van Spriel 14 years ago
parent
commit
fa0ace7fd3
1 changed files with 1 additions and 3 deletions
  1. 1 3
      drivers/staging/brcm80211/brcmsmac/srom.c

+ 1 - 3
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;
 }