diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 16:28:20 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 16:28:20 -0500 |
| commit | dad2ad82c5f058367df79de022bd12d36afcd065 (patch) | |
| tree | 426a1a6ca8762356b375527768bedc2de0bd25e9 /arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c | |
| parent | 7079060f3e86ea4c1d4e9c1e356592ef9dcaaa1f (diff) | |
| parent | b7fb358c7c36a14927d5523ea674e69f90c51d1d (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
Diffstat (limited to 'arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c')
| -rw-r--r-- | arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c index caa9f7711343..871366b83b3f 100644 --- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c +++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c | |||
| @@ -377,10 +377,9 @@ acpi_cpufreq_cpu_init ( | |||
| 377 | arg0.buffer.length = 12; | 377 | arg0.buffer.length = 12; |
| 378 | arg0.buffer.pointer = (u8 *) arg0_buf; | 378 | arg0.buffer.pointer = (u8 *) arg0_buf; |
| 379 | 379 | ||
| 380 | data = kmalloc(sizeof(struct cpufreq_acpi_io), GFP_KERNEL); | 380 | data = kzalloc(sizeof(struct cpufreq_acpi_io), GFP_KERNEL); |
| 381 | if (!data) | 381 | if (!data) |
| 382 | return (-ENOMEM); | 382 | return (-ENOMEM); |
| 383 | memset(data, 0, sizeof(struct cpufreq_acpi_io)); | ||
| 384 | 383 | ||
| 385 | acpi_io_data[cpu] = data; | 384 | acpi_io_data[cpu] = data; |
| 386 | 385 | ||