diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-23 00:55:13 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-23 00:55:13 +0200 |
| commit | 4eb5178c9cc09295111b79a99183f555c51887b4 (patch) | |
| tree | 71b8b2446558c5175e82240c07a6fbe4916a1b93 /drivers/cpufreq/ia64-acpi-cpufreq.c | |
| parent | b36f4be3de1b123d8601de062e7dbfc904f305fb (diff) | |
| parent | 5025d628c8659fbf939f929107bf76db81dcdfff (diff) | |
Merge back earlier 'pm-cpufreq' material.
Diffstat (limited to 'drivers/cpufreq/ia64-acpi-cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/ia64-acpi-cpufreq.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/cpufreq/ia64-acpi-cpufreq.c b/drivers/cpufreq/ia64-acpi-cpufreq.c index 573c14ea802..3e14f031717 100644 --- a/drivers/cpufreq/ia64-acpi-cpufreq.c +++ b/drivers/cpufreq/ia64-acpi-cpufreq.c @@ -274,7 +274,7 @@ acpi_cpufreq_cpu_init ( pr_debug("acpi_cpufreq_cpu_init\n"); - data = kzalloc(sizeof(struct cpufreq_acpi_io), GFP_KERNEL); + data = kzalloc(sizeof(*data), GFP_KERNEL); if (!data) return (-ENOMEM); @@ -304,7 +304,7 @@ acpi_cpufreq_cpu_init ( } /* alloc freq_table */ - data->freq_table = kmalloc(sizeof(struct cpufreq_frequency_table) * + data->freq_table = kmalloc(sizeof(*data->freq_table) * (data->acpi_data.state_count + 1), GFP_KERNEL); if (!data->freq_table) { @@ -409,7 +409,6 @@ static struct cpufreq_driver acpi_cpufreq_driver = { .init = acpi_cpufreq_cpu_init, .exit = acpi_cpufreq_cpu_exit, .name = "acpi-cpufreq", - .owner = THIS_MODULE, .attr = acpi_cpufreq_attr, }; |