Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] powernow-k8: check space_id of _PCT registers to be FFH
+7
-6
+7
-6
arch/x86/kernel/cpu/cpufreq/powernow-k8.c
+7
-6
arch/x86/kernel/cpu/cpufreq/powernow-k8.c
···
835
835
{
836
836
struct cpufreq_frequency_table *powernow_table;
837
837
int ret_val = -ENODEV;
838
-
acpi_integer space_id;
838
+
acpi_integer control, status;
839
839
840
840
if (acpi_processor_register_performance(&data->acpi_data, data->cpu)) {
841
841
dprintk("register performance failed: bad ACPI data\n");
···
848
848
goto err_out;
849
849
}
850
850
851
-
space_id = data->acpi_data.control_register.space_id;
852
-
if ((space_id != ACPI_ADR_SPACE_FIXED_HARDWARE) ||
853
-
(space_id != ACPI_ADR_SPACE_FIXED_HARDWARE)) {
851
+
control = data->acpi_data.control_register.space_id;
852
+
status = data->acpi_data.status_register.space_id;
853
+
854
+
if ((control != ACPI_ADR_SPACE_FIXED_HARDWARE) ||
855
+
(status != ACPI_ADR_SPACE_FIXED_HARDWARE)) {
854
856
dprintk("Invalid control/status registers (%x - %x)\n",
855
-
data->acpi_data.control_register.space_id,
856
-
space_id);
857
+
control, status);
857
858
goto err_out;
858
859
}
859
860