diff options
| author | Len Brown <len.brown@intel.com> | 2007-04-28 23:12:03 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-04-28 23:12:03 -0400 |
| commit | fb16596997ded3e70d308bec58e32c1e2c5cf9b0 (patch) | |
| tree | 28939b49c26e51d2c22047ef2e07f4b1d6352bbb /drivers/acpi/container.c | |
| parent | f188291aec9b17ef7cec01db66b9cdb6fae26372 (diff) | |
| parent | afd3810d9b6b0d446a34e1d4e94f0cc020b00a14 (diff) | |
| download | kernel-crypto-fb16596997ded3e70d308bec58e32c1e2c5cf9b0.tar.gz kernel-crypto-fb16596997ded3e70d308bec58e32c1e2c5cf9b0.tar.xz kernel-crypto-fb16596997ded3e70d308bec58e32c1e2c5cf9b0.zip | |
Pull misc-for-upstream into release branch
Diffstat (limited to 'drivers/acpi/container.c')
| -rw-r--r-- | drivers/acpi/container.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c index 0930d9413df..0dd3bf7c0ed 100644 --- a/drivers/acpi/container.c +++ b/drivers/acpi/container.c @@ -49,8 +49,6 @@ MODULE_AUTHOR("Anil S Keshavamurthy"); MODULE_DESCRIPTION("ACPI container driver"); MODULE_LICENSE("GPL"); -#define ACPI_STA_PRESENT (0x00000001) - static int acpi_container_add(struct acpi_device *device); static int acpi_container_remove(struct acpi_device *device, int type); @@ -75,13 +73,13 @@ static int is_device_present(acpi_handle handle) status = acpi_get_handle(handle, "_STA", &temp); if (ACPI_FAILURE(status)) - return 1; /* _STA not found, assmue device present */ + return 1; /* _STA not found, assume device present */ status = acpi_evaluate_integer(handle, "_STA", NULL, &sta); if (ACPI_FAILURE(status)) return 0; /* Firmware error */ - return ((sta & ACPI_STA_PRESENT) == ACPI_STA_PRESENT); + return ((sta & ACPI_STA_DEVICE_PRESENT) == ACPI_STA_DEVICE_PRESENT); } /*******************************************************************/ |