Browse Source

cpufreq: stats: Fix error handling in __cpufreq_stats_create_table()

Remove sysfs group if __cpufreq_stats_create_table() fails after creating
one.

Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Saravana Kannan <skannan@codeaurora.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Saravana Kannan 11 years ago
parent
commit
0b7528d963
1 changed files with 3 additions and 1 deletions
  1. 3 1
      drivers/cpufreq/cpufreq_stats.c

+ 3 - 1
drivers/cpufreq/cpufreq_stats.c

@@ -216,7 +216,7 @@ static int __cpufreq_stats_create_table(struct cpufreq_policy *policy,
 	stat->time_in_state = kzalloc(alloc_size, GFP_KERNEL);
 	stat->time_in_state = kzalloc(alloc_size, GFP_KERNEL);
 	if (!stat->time_in_state) {
 	if (!stat->time_in_state) {
 		ret = -ENOMEM;
 		ret = -ENOMEM;
-		goto error_out;
+		goto error_alloc;
 	}
 	}
 	stat->freq_table = (unsigned int *)(stat->time_in_state + count);
 	stat->freq_table = (unsigned int *)(stat->time_in_state + count);
 
 
@@ -237,6 +237,8 @@ static int __cpufreq_stats_create_table(struct cpufreq_policy *policy,
 	stat->last_index = freq_table_get_index(stat, policy->cur);
 	stat->last_index = freq_table_get_index(stat, policy->cur);
 	spin_unlock(&cpufreq_stats_lock);
 	spin_unlock(&cpufreq_stats_lock);
 	return 0;
 	return 0;
+error_alloc:
+	sysfs_remove_group(&policy->kobj, &stats_attr_group);
 error_out:
 error_out:
 	kfree(stat);
 	kfree(stat);
 	per_cpu(cpufreq_stats_table, cpu) = NULL;
 	per_cpu(cpufreq_stats_table, cpu) = NULL;