]> www.infradead.org Git - users/hch/misc.git/commitdiff
cpufreq: Reorder cpufreq_online() error code path
authorViresh Kumar <viresh.kumar@linaro.org>
Thu, 22 Feb 2018 05:59:43 +0000 (11:29 +0530)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 27 Feb 2018 17:22:12 +0000 (18:22 +0100)
Ideally the de-allocation of resources should happen in the exact
opposite order in which they were allocated. It helps maintain the code
in long term, even if nothing really breaks with incorrect ordering.

That wasn't followed in cpufreq_online() and it has some
inconsistencies.  For example, the symlinks were created from within
the locked region while they are removed only after putting the locks.
Also ->exit() should have been called only after the symlinks are
removed and the lock is dropped, as that was the case when ->init()
was first called.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
[ rjw: Subject ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/cpufreq/cpufreq.c

index de33ebf008ada0ba7bad516dbc7322553e684737..8814c572e263d95570c31959e8c71d01cbfae52a 100644 (file)
@@ -1327,14 +1327,14 @@ static int cpufreq_online(unsigned int cpu)
        return 0;
 
 out_exit_policy:
+       for_each_cpu(j, policy->real_cpus)
+               remove_cpu_dev_symlink(policy, get_cpu_device(j));
+
        up_write(&policy->rwsem);
 
        if (cpufreq_driver->exit)
                cpufreq_driver->exit(policy);
 
-       for_each_cpu(j, policy->real_cpus)
-               remove_cpu_dev_symlink(policy, get_cpu_device(j));
-
 out_free_policy:
        cpufreq_policy_free(policy);
        return ret;