diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 12:22:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 12:22:43 -0700 |
| commit | ed8319e9b269ed19449432db3aefc11eb7be7376 (patch) | |
| tree | edc9befbef6d5d42a6c51a2eac39c1172abab242 | |
| parent | bc23416cd4579093acc1e7d819eee747def623da (diff) | |
| parent | e29df91e67428c1a651d18df6ec047fcb30282d3 (diff) | |
| download | op-kernel-dev-ed8319e9b269ed19449432db3aefc11eb7be7376.zip op-kernel-dev-ed8319e9b269ed19449432db3aefc11eb7be7376.tar.gz | |
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 0051959..ceba593 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) ret = sysfs_create_bin_file(tables_kobj, &tbl_attr->attr); - if (ret) + if (ret) { kfree(tbl_attr); + tbl_attr = NULL; + } sfi_unmap_table(th); return tbl_attr; |
