diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-07 22:51:47 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-07 22:51:47 -0500 |
commit | 6b995751c2e851d2bc9c277b5884d0adb519e31d (patch) | |
tree | 7a15b41b5d8ce612915584a0773c670d5c0ab5b8 /arch/ppc64/kernel/scanlog.c | |
parent | 6c2f4267833f453156f8f439cc32eb4c92f357b4 (diff) | |
parent | d27ba47e7e8c466c18983a1779d611f82d6a354f (diff) |
Merge branch 'master'
Diffstat (limited to 'arch/ppc64/kernel/scanlog.c')
-rw-r--r-- | arch/ppc64/kernel/scanlog.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ppc64/kernel/scanlog.c b/arch/ppc64/kernel/scanlog.c index 215bf8900304..2edc947f7c44 100644 --- a/arch/ppc64/kernel/scanlog.c +++ b/arch/ppc64/kernel/scanlog.c | |||
@@ -225,8 +225,7 @@ int __init scanlog_init(void) | |||
225 | void __exit scanlog_cleanup(void) | 225 | void __exit scanlog_cleanup(void) |
226 | { | 226 | { |
227 | if (proc_ppc64_scan_log_dump) { | 227 | if (proc_ppc64_scan_log_dump) { |
228 | if (proc_ppc64_scan_log_dump->data) | 228 | kfree(proc_ppc64_scan_log_dump->data); |
229 | kfree(proc_ppc64_scan_log_dump->data); | ||
230 | remove_proc_entry("scan-log-dump", proc_ppc64_scan_log_dump->parent); | 229 | remove_proc_entry("scan-log-dump", proc_ppc64_scan_log_dump->parent); |
231 | } | 230 | } |
232 | } | 231 | } |