From 9ad6e68f3edc449b0b5d200a97901d521f3027cd Mon Sep 17 00:00:00 2001 From: Alex He Date: Tue, 21 Feb 2012 16:58:10 +0800 Subject: [PATCH] --- yaml --- r: 298033 b: refs/heads/master c: 37239978778806ecba54da60676abb46870acebb h: refs/heads/master i: 298031: 597859e8b208ce24f8948b06c101c0c70c97664d v: v3 --- [refs] | 2 +- trunk/drivers/acpi/scan.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ef2bcbf010b9..73a1cf6731ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9505626d7bfeb5bd4b85acb483831ac640b2a5e8 +refs/heads/master: 37239978778806ecba54da60676abb46870acebb diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c index 8ab80bafe3f1..5d24a17aa854 100644 --- a/trunk/drivers/acpi/scan.c +++ b/trunk/drivers/acpi/scan.c @@ -880,7 +880,6 @@ static int acpi_bus_get_power_flags(struct acpi_device *device) int j; device->power.flags.power_resources = 1; - ps->flags.valid = 1; for (j = 0; j < ps->resources.count; j++) acpi_bus_add_power_resource(ps->resources.handles[j]); } @@ -888,10 +887,8 @@ static int acpi_bus_get_power_flags(struct acpi_device *device) /* Evaluate "_PSx" to see if we can do explicit sets */ object_name[2] = 'S'; status = acpi_get_handle(device->handle, object_name, &handle); - if (ACPI_SUCCESS(status)) { + if (ACPI_SUCCESS(status)) ps->flags.explicit_set = 1; - ps->flags.valid = 1; - } /* State is valid if we have some power control */ if (ps->resources.count || ps->flags.explicit_set)