Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  amd64_edac: Fix potential memleak

drivers/edac/amd64_edac.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2679,7 +2679,7 @@ static int __init amd64_edac_init(void)
		mcis = kzalloc(amd_nb_num() * sizeof(mcis[0]), GFP_KERNEL);
		ecc_stngs = kzalloc(amd_nb_num() * sizeof(ecc_stngs[0]), GFP_KERNEL);
		if (!(mcis && ecc_stngs))
		goto err_ret;
		goto err_free;

		msrs = msrs_alloc();
		if (!msrs)