diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-11 09:09:05 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-11 09:09:05 -0400 |
| commit | 1c00f73c8361fa26e3d28e93fb922a6aa958739c (patch) | |
| tree | 2b2fb56448c6fecd7e9692aca791af0d97f758d9 | |
| parent | 2ce7598c9a453e0acd0e07be7be3f5eb39608ebd (diff) | |
| parent | d359992070901bcd774615910d36cec67dbdb1a7 (diff) | |
Merge branch 'pm-cpufreq'
* pm-cpufreq:
cpufreq / OPP: Fix the order of arguments for kcalloc()
| -rw-r--r-- | drivers/cpufreq/cpufreq_opp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/cpufreq_opp.c b/drivers/cpufreq/cpufreq_opp.c index f7a32d2326c6..773bcde893c0 100644 --- a/drivers/cpufreq/cpufreq_opp.c +++ b/drivers/cpufreq/cpufreq_opp.c | |||
| @@ -60,7 +60,7 @@ int dev_pm_opp_init_cpufreq_table(struct device *dev, | |||
| 60 | goto out; | 60 | goto out; |
| 61 | } | 61 | } |
| 62 | 62 | ||
| 63 | freq_table = kcalloc(sizeof(*freq_table), (max_opps + 1), GFP_ATOMIC); | 63 | freq_table = kcalloc((max_opps + 1), sizeof(*freq_table), GFP_ATOMIC); |
| 64 | if (!freq_table) { | 64 | if (!freq_table) { |
| 65 | ret = -ENOMEM; | 65 | ret = -ENOMEM; |
| 66 | goto out; | 66 | goto out; |