Skip to content

Commit

Permalink
[PATCH] fix "ACPI: Processor native C-states using MWAIT"
Browse files Browse the repository at this point in the history
This patch breaks C-state discovery on my IBM IntelliStation Z30 because
the return value of acpi_processor_get_power_info_fadt is not assigned to
"result" in the case that acpi_processor_get_power_info_cst returns
-ENODEV.  Thus, if ACPI provides C-state data via the FADT and not _CST (as
is the case on this machine), we incorrectly exit the function with -ENODEV
after reading the FADT.  The attached patch sets the value of result so
that we don't exit early.

Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
Acked-by: "Pallipadi, Venkatesh" <venkatesh.pallipadi@intel.com>
Acked-by: "Brown, Len" <len.brown@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Darrick J. Wong authored and Linus Torvalds committed Oct 20, 2006
1 parent 74e8b51 commit c5a114f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/acpi/processor_idle.c
Original file line number Diff line number Diff line change
Expand Up @@ -962,7 +962,7 @@ static int acpi_processor_get_power_info(struct acpi_processor *pr)

result = acpi_processor_get_power_info_cst(pr);
if (result == -ENODEV)
acpi_processor_get_power_info_fadt(pr);
result = acpi_processor_get_power_info_fadt(pr);

if (result)
return result;
Expand Down

0 comments on commit c5a114f

Please sign in to comment.