summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-29 14:40:08 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-29 14:40:08 -0700
commit590f47a1d945c611530a85057e9ad7a3bbb50578 (patch)
tree226626fbdb53f3a8fea19134100091be4aefc900 /arch
parenta9b2e9170bdf1dd27ca4aa9a63048065d252d116 (diff)
parent094ce7fde493a1196b8152f9f9e73c20e24a2b05 (diff)
downloadop-kernel-dev-590f47a1d945c611530a85057e9ad7a3bbb50578.zip
op-kernel-dev-590f47a1d945c611530a85057e9ad7a3bbb50578.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/kernel/cpu/cpufreq/powernow-k8.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
index de5deeb..ab6e061 100644
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
@@ -735,12 +735,15 @@ static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data)
}
for (i = 0; i < data->acpi_data.state_count; i++) {
- if (data->exttype) {
- u32 fid = data->acpi_data.states[i].status & FID_MASK;
- u32 vid = (data->acpi_data.states[i].status >> VID_SHIFT) & VID_MASK;
+ u32 fid;
+ u32 vid;
+
+ if (data->exttype) {
+ fid = data->acpi_data.states[i].status & FID_MASK;
+ vid = (data->acpi_data.states[i].status >> VID_SHIFT) & VID_MASK;
} else {
- u32 fid = data->acpi_data.states[i].control & FID_MASK;
- u32 vid = (data->acpi_data.states[i].control >> VID_SHIFT) & VID_MASK;
+ fid = data->acpi_data.states[i].control & FID_MASK;
+ vid = (data->acpi_data.states[i].control >> VID_SHIFT) & VID_MASK;
}
dprintk(" %d : fid 0x%x, vid 0x%x\n", i, fid, vid);
OpenPOWER on IntegriCloud