aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86_64/kernel/mce_amd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/mce_amd.c b/arch/x86_64/kernel/mce_amd.c
index 0b62a44ab34b..d3ad7d81266d 100644
--- a/arch/x86_64/kernel/mce_amd.c
+++ b/arch/x86_64/kernel/mce_amd.c
@@ -320,7 +320,7 @@ static struct kobj_type threshold_ktype = {
320static __cpuinit int threshold_create_bank(unsigned int cpu, int bank) 320static __cpuinit int threshold_create_bank(unsigned int cpu, int bank)
321{ 321{
322 int err = 0; 322 int err = 0;
323 struct threshold_bank *b = 0; 323 struct threshold_bank *b = NULL;
324 324
325#ifdef CONFIG_SMP 325#ifdef CONFIG_SMP
326 if (cpu_core_id[cpu] && shared_bank[bank]) { /* symlink */ 326 if (cpu_core_id[cpu] && shared_bank[bank]) { /* symlink */
@@ -409,7 +409,7 @@ static __cpuinit void threshold_remove_bank(unsigned int cpu, int bank)
409 if (shared_bank[bank] && atomic_read(&b->kobj.kref.refcount) > 2) { 409 if (shared_bank[bank] && atomic_read(&b->kobj.kref.refcount) > 2) {
410 sprintf(name, "bank%i", bank); 410 sprintf(name, "bank%i", bank);
411 sysfs_remove_link(&per_cpu(device_threshold, cpu).kobj, name); 411 sysfs_remove_link(&per_cpu(device_threshold, cpu).kobj, name);
412 per_cpu(threshold_banks, cpu)[bank] = 0; 412 per_cpu(threshold_banks, cpu)[bank] = NULL;
413 } else { 413 } else {
414 kobject_unregister(&b->kobj); 414 kobject_unregister(&b->kobj);
415 kfree(per_cpu(threshold_banks, cpu)[bank]); 415 kfree(per_cpu(threshold_banks, cpu)[bank]);