Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6] / drivers / acpi / processor_throttling.c

diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index 86c790e9f4fc926edcb1eb2b9c2fc2023cc5dbc0..1b8e592a82415a0772ebf1474acde406229236c9 100644 (file)
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -987,7 +987,7 @@ static int acpi_processor_set_throttling_ptc(struct acpi_processor *pr,
 int acpi_processor_set_throttling(struct acpi_processor *pr, int state)
 {
        cpumask_t saved_mask;
-       int ret;
+       int ret = 0;
        unsigned int i;
        struct acpi_processor *match_pr;
        struct acpi_processor_throttling *p_throttling;