mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 20:51:44 +00:00
Merge branch 'pm-cpufreq'
* pm-cpufreq: cpufreq: exynos: Remove unwanted EXPORT_SYMBOL cpufreq: tegra: don't error target() when suspended
This commit is contained in:
commit
db8fbb49df
@ -157,4 +157,3 @@ err_moutcore:
|
||||
pr_debug("%s: failed initialization\n", __func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
EXPORT_SYMBOL(exynos4210_cpufreq_init);
|
||||
|
@ -211,4 +211,3 @@ err_moutcore:
|
||||
pr_debug("%s: failed initialization\n", __func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
EXPORT_SYMBOL(exynos4x12_cpufreq_init);
|
||||
|
@ -236,4 +236,3 @@ err_moutcore:
|
||||
pr_err("%s: failed initialization\n", __func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
EXPORT_SYMBOL(exynos5250_cpufreq_init);
|
||||
|
@ -142,10 +142,8 @@ static int tegra_target(struct cpufreq_policy *policy, unsigned int index)
|
||||
|
||||
mutex_lock(&tegra_cpu_lock);
|
||||
|
||||
if (is_suspended) {
|
||||
ret = -EBUSY;
|
||||
if (is_suspended)
|
||||
goto out;
|
||||
}
|
||||
|
||||
freq = freq_table[index].frequency;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user