diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-29 11:11:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-29 11:11:18 -0700 |
| commit | 8c82840e5414259b1963da36f82b64a755fafc75 (patch) | |
| tree | 0087ca8ae4991d99fdcf93a70ca99db76812948d /drivers | |
| parent | c86defc82c18b648193b5c6aabcc6204fd6bb373 (diff) | |
| parent | a9f0fbe2bbf328f869fc5ee5a12c6a4118c32689 (diff) | |
| download | linux-3.10-8c82840e5414259b1963da36f82b64a755fafc75.tar.gz linux-3.10-8c82840e5414259b1963da36f82b64a755fafc75.tar.bz2 linux-3.10-8c82840e5414259b1963da36f82b64a755fafc75.zip | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/edac/amd64_edac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 0be30e978c8..31e71c4fc83 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -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) |