diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 15:22:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 15:22:43 -0400 |
commit | ed8319e9b269ed19449432db3aefc11eb7be7376 (patch) | |
tree | edc9befbef6d5d42a6c51a2eac39c1172abab242 | |
parent | bc23416cd4579093acc1e7d819eee747def623da (diff) | |
parent | e29df91e67428c1a651d18df6ec047fcb30282d3 (diff) |
Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6
* 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6:
SFI: do not return freed pointer
-rw-r--r-- | drivers/sfi/sfi_core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/sfi/sfi_core.c b/drivers/sfi/sfi_core.c index 005195958647..ceba593dc84f 100644 --- a/drivers/sfi/sfi_core.c +++ b/drivers/sfi/sfi_core.c | |||
@@ -441,8 +441,10 @@ struct sfi_table_attr __init *sfi_sysfs_install_table(u64 pa) | |||
441 | 441 | ||
442 | ret = sysfs_create_bin_file(tables_kobj, | 442 | ret = sysfs_create_bin_file(tables_kobj, |
443 | &tbl_attr->attr); | 443 | &tbl_attr->attr); |
444 | if (ret) | 444 | if (ret) { |
445 | kfree(tbl_attr); | 445 | kfree(tbl_attr); |
446 | tbl_attr = NULL; | ||
447 | } | ||
446 | 448 | ||
447 | sfi_unmap_table(th); | 449 | sfi_unmap_table(th); |
448 | return tbl_attr; | 450 | return tbl_attr; |