lkml.org 
[lkml]   [2018]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 13/65] cpufreq: s3c24xx: Fix broken s3c_cpufreq_init()
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Viresh Kumar <viresh.kumar@linaro.org>

    commit 0373ca74831b0f93cd4cdbf7ad3aec3c33a479a5 upstream.

    commit a307a1e6bc0d "cpufreq: s3c: use cpufreq_generic_init()"
    accidentally broke cpufreq on s3c2410 and s3c2412.

    These two platforms don't have a CPU frequency table and used to skip
    calling cpufreq_table_validate_and_show() for them. But with the
    above commit, we started calling it unconditionally and that will
    eventually fail as the frequency table pointer is NULL.

    Fix this by calling cpufreq_table_validate_and_show() conditionally
    again.

    Fixes: a307a1e6bc0d "cpufreq: s3c: use cpufreq_generic_init()"
    Cc: 3.13+ <stable@vger.kernel.org> # v3.13+
    Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/cpufreq/s3c24xx-cpufreq.c | 8 +++++++-
    1 file changed, 7 insertions(+), 1 deletion(-)

    --- a/drivers/cpufreq/s3c24xx-cpufreq.c
    +++ b/drivers/cpufreq/s3c24xx-cpufreq.c
    @@ -351,7 +351,13 @@ struct clk *s3c_cpufreq_clk_get(struct d
    static int s3c_cpufreq_init(struct cpufreq_policy *policy)
    {
    policy->clk = clk_arm;
    - return cpufreq_generic_init(policy, ftab, cpu_cur.info->latency);
    +
    + policy->cpuinfo.transition_latency = cpu_cur.info->latency;
    +
    + if (ftab)
    + return cpufreq_table_validate_and_show(policy, ftab);
    +
    + return 0;
    }

    static int __init s3c_cpufreq_initclks(void)

    \
     
     \ /
      Last update: 2018-03-10 01:41    [W:4.073 / U:0.432 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site