diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 13:28:20 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 13:28:20 -0800 |
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 caa9f771134..871366b83b3 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 ( arg0.buffer.length = 12; arg0.buffer.pointer = (u8 *) arg0_buf; - data = kmalloc(sizeof(struct cpufreq_acpi_io), GFP_KERNEL); + data = kzalloc(sizeof(struct cpufreq_acpi_io), GFP_KERNEL); if (!data) return (-ENOMEM); - memset(data, 0, sizeof(struct cpufreq_acpi_io)); acpi_io_data[cpu] = data; |