Skip to content

Commit

Permalink
cpufreq: propagate error returned by kobject_move()
Browse files Browse the repository at this point in the history
We are returning -EINVAL instead of the error returned from kobject_move() when
it fails. Propagate the actual error number.

Also add a meaningful print when sysfs_create_link() fails.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Viresh Kumar authored and Rafael J. Wysocki committed Jul 21, 2014
1 parent 1461dc7 commit 41dfd90
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/cpufreq/cpufreq.c
Original file line number Diff line number Diff line change
Expand Up @@ -1322,10 +1322,12 @@ static int cpufreq_nominate_new_policy_cpu(struct cpufreq_policy *policy,
ret = kobject_move(&policy->kobj, &cpu_dev->kobj);
if (ret) {
pr_err("%s: Failed to move kobj: %d\n", __func__, ret);
ret = sysfs_create_link(&cpu_dev->kobj, &policy->kobj,
"cpufreq");

return -EINVAL;
if (sysfs_create_link(&cpu_dev->kobj, &policy->kobj, "cpufreq"))
pr_err("%s: Failed to restore kobj link to cpu:%d\n",
__func__, cpu_dev->id);

return ret;
}

return cpu_dev->id;
Expand Down

0 comments on commit 41dfd90

Please sign in to comment.