diff options
author | Len Brown <len.brown@intel.com> | 2005-07-12 17:21:56 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-07-12 17:21:56 -0400 |
commit | 5028770a42e7bc4d15791a44c28f0ad539323807 (patch) | |
tree | 74800e35129775413c13ce7caf036ca19e3ce56c /drivers/acpi/scan.c | |
parent | 9f02d6b7b43d46a74dd385f06090104ecd0fb807 (diff) | |
parent | d8683a0cb5d09cb7f19feefa708424a84577e68f (diff) |
[ACPI] merge acpi-2.6.12 branch into latest Linux 2.6.13-rc...
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r-- | drivers/acpi/scan.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 337d49b5564b..cbcda30c172d 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
@@ -1061,13 +1061,15 @@ acpi_add_single_object ( | |||
1061 | /* | 1061 | /* |
1062 | * Status | 1062 | * Status |
1063 | * ------ | 1063 | * ------ |
1064 | * See if the device is present. We always assume that non-Device() | 1064 | * See if the device is present. We always assume that non-Device |
1065 | * objects (e.g. thermal zones, power resources, processors, etc.) are | 1065 | * and non-Processor objects (e.g. thermal zones, power resources, |
1066 | * present, functioning, etc. (at least when parent object is present). | 1066 | * etc.) are present, functioning, etc. (at least when parent object |
1067 | * Note that _STA has a different meaning for some objects (e.g. | 1067 | * is present). Note that _STA has a different meaning for some |
1068 | * power resources) so we need to be careful how we use it. | 1068 | * objects (e.g. power resources) so we need to be careful how we use |
1069 | * it. | ||
1069 | */ | 1070 | */ |
1070 | switch (type) { | 1071 | switch (type) { |
1072 | case ACPI_BUS_TYPE_PROCESSOR: | ||
1071 | case ACPI_BUS_TYPE_DEVICE: | 1073 | case ACPI_BUS_TYPE_DEVICE: |
1072 | result = acpi_bus_get_status(device); | 1074 | result = acpi_bus_get_status(device); |
1073 | if (ACPI_FAILURE(result) || !device->status.present) { | 1075 | if (ACPI_FAILURE(result) || !device->status.present) { |