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: (119 commits)
  ACPI: don't pass handle for fixed hardware notifications
  ACPI: remove null pointer checks in deferred execution path
  ACPI: simplify deferred execution path
  acerhdf: additional BIOS versions
  acerhdf: convert to dev_pm_ops
  acerhdf: fix fan control for AOA150 model
  thermal: add missing Kconfig dependency
  acpi: switch /proc/acpi/{debug_layer,debug_level} to seq_file
  hp-wmi: fix rfkill memory leak on unload
  ACPI: remove unnecessary #ifdef CONFIG_DMI
  ACPI: linux/acpi.h should not include linux/dmi.h
  hwmon driver for ACPI 4.0 power meters
  topstar-laptop: add new driver for hotkeys support on Topstar N01
  thinkpad_acpi: fix rfkill memory leak on unload
  thinkpad-acpi: report brightness events when required
  thinkpad-acpi: don't poll by default any of the reserved hotkeys
  thinkpad-acpi: Fix procfs hotkey reset command
  thinkpad-acpi: deprecate hotkey_bios_mask
  thinkpad-acpi: hotkey poll fixes
  thinkpad-acpi: be more strict when detecting a ThinkPad
  ...

1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index fe0cdf83641a..642bb305cb65 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -35,6 +35,8 @@
 #include <acpi/acpi_drivers.h>
 #include <acpi/container.h>
 
+#define PREFIX "ACPI: "
+
 #define ACPI_CONTAINER_DEVICE_NAME      "ACPI container device"
 #define ACPI_CONTAINER_CLASS            "container"
 
@@ -200,20 +202,17 @@ container_walk_namespace_cb(acpi_handle handle,
                             u32 lvl, void *context, void **rv)
 {
         char *hid = NULL;
-        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
         struct acpi_device_info *info;
         acpi_status status;
         int *action = context;
 
-
-        status = acpi_get_object_info(handle, &buffer);
-        if (ACPI_FAILURE(status) || !buffer.pointer) {
+        status = acpi_get_object_info(handle, &info);
+        if (ACPI_FAILURE(status)) {
                 return AE_OK;
         }
 
-        info = buffer.pointer;
         if (info->valid & ACPI_VALID_HID)
-                hid = info->hardware_id.value;
+                hid = info->hardware_id.string;
 
         if (hid == NULL) {
                 goto end;
@@ -240,7 +239,7 @@ container_walk_namespace_cb(acpi_handle handle,
         }
 
       end:
-        kfree(buffer.pointer);
+        kfree(info);
 
         return AE_OK;
 }