diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-29 14:11:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-29 14:11:18 -0400 |
| commit | 8c82840e5414259b1963da36f82b64a755fafc75 (patch) | |
| tree | 0087ca8ae4991d99fdcf93a70ca99db76812948d | |
| parent | c86defc82c18b648193b5c6aabcc6204fd6bb373 (diff) | |
| parent | a9f0fbe2bbf328f869fc5ee5a12c6a4118c32689 (diff) | |
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
| -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 0be30e978c85..31e71c4fc831 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c | |||
| @@ -2679,7 +2679,7 @@ static int __init amd64_edac_init(void) | |||
| 2679 | mcis = kzalloc(amd_nb_num() * sizeof(mcis[0]), GFP_KERNEL); | 2679 | mcis = kzalloc(amd_nb_num() * sizeof(mcis[0]), GFP_KERNEL); |
| 2680 | ecc_stngs = kzalloc(amd_nb_num() * sizeof(ecc_stngs[0]), GFP_KERNEL); | 2680 | ecc_stngs = kzalloc(amd_nb_num() * sizeof(ecc_stngs[0]), GFP_KERNEL); |
| 2681 | if (!(mcis && ecc_stngs)) | 2681 | if (!(mcis && ecc_stngs)) |
| 2682 | goto err_ret; | 2682 | goto err_free; |
| 2683 | 2683 | ||
| 2684 | msrs = msrs_alloc(); | 2684 | msrs = msrs_alloc(); |
| 2685 | if (!msrs) | 2685 | if (!msrs) |