diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-04-26 22:07:50 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-04-26 22:07:50 -0400 |
| commit | c0f7fc241c43a35140df626cab528f6994c348c9 (patch) | |
| tree | 6927e4037cb3ef6c44bcdfc417681baf25c8895a /drivers/cpufreq | |
| parent | 517bdd31cc673e8ae4963682fca3ca44178bc518 (diff) | |
| parent | ad387ec4bcdf087faaf084a3db8f681295463b01 (diff) | |
| download | linux-rt-c0f7fc241c43a35140df626cab528f6994c348c9.tar.gz | |
Merge tag 'v4.9.170' into v4.9-rt
This is the 4.9.170 stable release
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/pxa2xx-cpufreq.c | 4 | ||||
| -rw-r--r-- | drivers/cpufreq/tegra124-cpufreq.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/cpufreq/pxa2xx-cpufreq.c b/drivers/cpufreq/pxa2xx-cpufreq.c index ce345bf34d5d..a24e9f037865 100644 --- a/drivers/cpufreq/pxa2xx-cpufreq.c +++ b/drivers/cpufreq/pxa2xx-cpufreq.c @@ -192,7 +192,7 @@ static int pxa_cpufreq_change_voltage(const struct pxa_freqs *pxa_freq) return ret; } -static void __init pxa_cpufreq_init_voltages(void) +static void pxa_cpufreq_init_voltages(void) { vcc_core = regulator_get(NULL, "vcc_core"); if (IS_ERR(vcc_core)) { @@ -208,7 +208,7 @@ static int pxa_cpufreq_change_voltage(const struct pxa_freqs *pxa_freq) return 0; } -static void __init pxa_cpufreq_init_voltages(void) { } +static void pxa_cpufreq_init_voltages(void) { } #endif static void find_freq_tables(struct cpufreq_frequency_table **freq_table, diff --git a/drivers/cpufreq/tegra124-cpufreq.c b/drivers/cpufreq/tegra124-cpufreq.c index 43530254201a..4bb154f6c54c 100644 --- a/drivers/cpufreq/tegra124-cpufreq.c +++ b/drivers/cpufreq/tegra124-cpufreq.c @@ -134,6 +134,8 @@ static int tegra124_cpufreq_probe(struct platform_device *pdev) platform_set_drvdata(pdev, priv); + of_node_put(np); + return 0; out_switch_to_pllx: |