Skip to content

Commit

Permalink
Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kern…
Browse files Browse the repository at this point in the history
…el/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
  • Loading branch information
Linus Torvalds committed Jun 4, 2010
2 parents bc23416 + e29df91 commit ed8319e
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/sfi/sfi_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit ed8319e

Please sign in to comment.