diff options
| author | Fenghua Yu <fenghua.yu@intel.com> | 2009-08-11 14:52:11 -0700 |
|---|---|---|
| committer | Fenghua Yu <fenghua.yu@intel.com> | 2009-08-11 14:52:11 -0700 |
| commit | 5359dffd4396f281c5b77de1acbee6fb1b333b23 (patch) | |
| tree | 2f54bb01bc9c721636788a9ff5d4f47ee7c8fc9e | |
| parent | bf2a4c7270b9a22243a91ab5efcc47aaf997c66b (diff) | |
| download | blackbird-op-linux-5359dffd4396f281c5b77de1acbee6fb1b333b23.tar.gz blackbird-op-linux-5359dffd4396f281c5b77de1acbee6fb1b333b23.zip | |
ia64/topology.c: exit cache_add_dev when kobject_init_and_add fails
Make cache_add_dev exit sysfs when kobject_init_and_add returns an error.
Signed-off-by: Xiaotian Feng <dfeng@redhat.com>
Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
| -rw-r--r-- | arch/ia64/kernel/topology.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c index bc80dff1df7a..8f060352e129 100644 --- a/arch/ia64/kernel/topology.c +++ b/arch/ia64/kernel/topology.c @@ -372,6 +372,10 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev) retval = kobject_init_and_add(&all_cpu_cache_info[cpu].kobj, &cache_ktype_percpu_entry, &sys_dev->kobj, "%s", "cache"); + if (unlikely(retval < 0)) { + cpu_cache_sysfs_exit(cpu); + return retval; + } for (i = 0; i < all_cpu_cache_info[cpu].num_cache_leaves; i++) { this_object = LEAF_KOBJECT_PTR(cpu,i); @@ -385,7 +389,7 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev) } kobject_put(&all_cpu_cache_info[cpu].kobj); cpu_cache_sysfs_exit(cpu); - break; + return retval; } kobject_uevent(&(this_object->kobj), KOBJ_ADD); } |
