Merge branch 'linus' into perf/core, to fix conflicts

[linux-2.6-microblaze.git] / tools / perf / util / config.c

diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index 4b893c6..84eb939 100644 (file)
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -701,10 +701,7 @@ struct perf_config_set *perf_config_set__new(void)
 
        if (set) {
                INIT_LIST_HEAD(&set->sections);
-               if (perf_config_set__init(set) < 0) {
-                       perf_config_set__delete(set);
-                       set = NULL;
-               }
+               perf_config_set__init(set);
        }
 
        return set;