diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
| commit | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (patch) | |
| tree | 0248fb8f7a3e445cc3c744252abeecabb9205c05 /arch/x86/kernel/kdebugfs.c | |
| parent | b6825d2df55aa7d7341c715b577b73a6a03dc944 (diff) | |
| parent | d5120ae72a066b18f98e0c45ce73262f58030851 (diff) | |
Merge branch 's3c-move' into devel
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'arch/x86/kernel/kdebugfs.c')
| -rw-r--r-- | arch/x86/kernel/kdebugfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/kdebugfs.c b/arch/x86/kernel/kdebugfs.c index f2d43bc75514..ff7d3b0124f1 100644 --- a/arch/x86/kernel/kdebugfs.c +++ b/arch/x86/kernel/kdebugfs.c | |||
| @@ -139,6 +139,7 @@ static int __init create_setup_data_nodes(struct dentry *parent) | |||
| 139 | if (PageHighMem(pg)) { | 139 | if (PageHighMem(pg)) { |
| 140 | data = ioremap_cache(pa_data, sizeof(*data)); | 140 | data = ioremap_cache(pa_data, sizeof(*data)); |
| 141 | if (!data) { | 141 | if (!data) { |
| 142 | kfree(node); | ||
| 142 | error = -ENXIO; | 143 | error = -ENXIO; |
| 143 | goto err_dir; | 144 | goto err_dir; |
| 144 | } | 145 | } |