diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-02-12 04:51:33 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-02-12 04:51:33 -0500 |
| commit | 0aae2bf81afe08f61276205f73aa57e80246056c (patch) | |
| tree | 114225c53980159bfb8c69957983bf5ad31dd8d7 | |
| parent | 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 (diff) | |
| parent | 4a823c0be80fa996234ebb41c80d40458b1bec1e (diff) | |
Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm into pm-opp
Pull and OPP update for 4.16-rc2 from Viresh Kumar.
* 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
opp: cpu: Replace GFP_ATOMIC with GFP_KERNEL in dev_pm_opp_init_cpufreq_table
| -rw-r--r-- | drivers/opp/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/opp/cpu.c b/drivers/opp/cpu.c index 2d87bc1adf38..0c0910709435 100644 --- a/drivers/opp/cpu.c +++ b/drivers/opp/cpu.c | |||
| @@ -55,7 +55,7 @@ int dev_pm_opp_init_cpufreq_table(struct device *dev, | |||
| 55 | if (max_opps <= 0) | 55 | if (max_opps <= 0) |
| 56 | return max_opps ? max_opps : -ENODATA; | 56 | return max_opps ? max_opps : -ENODATA; |
| 57 | 57 | ||
| 58 | freq_table = kcalloc((max_opps + 1), sizeof(*freq_table), GFP_ATOMIC); | 58 | freq_table = kcalloc((max_opps + 1), sizeof(*freq_table), GFP_KERNEL); |
| 59 | if (!freq_table) | 59 | if (!freq_table) |
| 60 | return -ENOMEM; | 60 | return -ENOMEM; |
| 61 | 61 | ||