diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 13:20:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 13:20:36 -0400 |
| commit | 765426e8ee4c0ab2bc9d44951f4865b8494cdbd0 (patch) | |
| tree | 2b46ab8953eff175c8d3474a9754c1ab1394e4de /drivers/acpi/container.c | |
| parent | 36ec891895020f3bc9953c8b11d079c6d77d76bd (diff) | |
| parent | 898b054f3eec5921320ae8614b5bdd7b07ea5b43 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (123 commits)
dock: make dock driver not a module
ACPI: fix ia64 build warning
ACPI: hack around sysfs warning with link order
ACPI suspend: fix build warning when CONFIG_ACPI_SLEEP=n
intel_menlo: fix build warning
panasonic-laptop: fix build
ACPICA: Update version to 20080926
ACPICA: Add support for zero-length buffer-to-string conversions
ACPICA: New: Validation for predefined ACPI methods/objects
ACPICA: Fix for implicit return compatibility
ACPICA: Fixed a couple memory leaks associated with "implicit return"
ACPICA: Optimize buffer allocation procedure
ACPICA: Fix possible memory leak, error exit path
ACPICA: Fix fault after mem allocation failure in AML parser
ACPICA: Remove unused ACPI register bit definition
ACPICA: Update version to 20080829
ACPICA: Fix possible memory leak in acpi_ns_get_external_pathname
ACPICA: Cleanup for internal Reference Object
ACPICA: Update comments - no functional changes
ACPICA: Update for Reference ACPI_OPERAND_OBJECT
...
Diffstat (limited to 'drivers/acpi/container.c')
| -rw-r--r-- | drivers/acpi/container.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c index 3c25ec7a1871..134818b265a9 100644 --- a/drivers/acpi/container.c +++ b/drivers/acpi/container.c | |||
| @@ -76,7 +76,7 @@ static int is_device_present(acpi_handle handle) | |||
| 76 | { | 76 | { |
| 77 | acpi_handle temp; | 77 | acpi_handle temp; |
| 78 | acpi_status status; | 78 | acpi_status status; |
| 79 | unsigned long sta; | 79 | unsigned long long sta; |
| 80 | 80 | ||
| 81 | 81 | ||
| 82 | status = acpi_get_handle(handle, "_STA", &temp); | 82 | status = acpi_get_handle(handle, "_STA", &temp); |
| @@ -108,7 +108,7 @@ static int acpi_container_add(struct acpi_device *device) | |||
| 108 | container->handle = device->handle; | 108 | container->handle = device->handle; |
| 109 | strcpy(acpi_device_name(device), ACPI_CONTAINER_DEVICE_NAME); | 109 | strcpy(acpi_device_name(device), ACPI_CONTAINER_DEVICE_NAME); |
| 110 | strcpy(acpi_device_class(device), ACPI_CONTAINER_CLASS); | 110 | strcpy(acpi_device_class(device), ACPI_CONTAINER_CLASS); |
| 111 | acpi_driver_data(device) = container; | 111 | device->driver_data = container; |
| 112 | 112 | ||
| 113 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device <%s> bid <%s>\n", | 113 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device <%s> bid <%s>\n", |
| 114 | acpi_device_name(device), acpi_device_bid(device))); | 114 | acpi_device_name(device), acpi_device_bid(device))); |