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/speedstep-centrino.c | |
| parent | 7079060f3e86ea4c1d4e9c1e356592ef9dcaaa1f (diff) | |
| parent | b7fb358c7c36a14927d5523ea674e69f90c51d1d (diff) | |
| download | lwn-dad2ad82c5f058367df79de022bd12d36afcd065.tar.gz lwn-dad2ad82c5f058367df79de022bd12d36afcd065.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
Diffstat (limited to 'arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c')
| -rw-r--r-- | arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c index 0ea010a7afb1..edb9873e27e3 100644 --- a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c +++ b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c @@ -423,12 +423,11 @@ static int centrino_cpu_init_acpi(struct cpufreq_policy *policy) } } - centrino_model[cpu] = kmalloc(sizeof(struct cpu_model), GFP_KERNEL); + centrino_model[cpu] = kzalloc(sizeof(struct cpu_model), GFP_KERNEL); if (!centrino_model[cpu]) { result = -ENOMEM; goto err_unreg; } - memset(centrino_model[cpu], 0, sizeof(struct cpu_model)); centrino_model[cpu]->model_name=NULL; centrino_model[cpu]->max_freq = p.states[0].core_frequency * 1000; |