aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/glue.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/glue.c')
-rw-r--r--drivers/acpi/glue.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index a8a5c29958c..c6645f26224 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -12,6 +12,8 @@
12#include <linux/rwsem.h> 12#include <linux/rwsem.h>
13#include <linux/acpi.h> 13#include <linux/acpi.h>
14 14
15#include "internal.h"
16
15#define ACPI_GLUE_DEBUG 0 17#define ACPI_GLUE_DEBUG 0
16#if ACPI_GLUE_DEBUG 18#if ACPI_GLUE_DEBUG
17#define DBG(x...) printk(PREFIX x) 19#define DBG(x...) printk(PREFIX x)
@@ -93,15 +95,13 @@ do_acpi_find_child(acpi_handle handle, u32 lvl, void *context, void **rv)
93{ 95{
94 acpi_status status; 96 acpi_status status;
95 struct acpi_device_info *info; 97 struct acpi_device_info *info;
96 struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
97 struct acpi_find_child *find = context; 98 struct acpi_find_child *find = context;
98 99
99 status = acpi_get_object_info(handle, &buffer); 100 status = acpi_get_object_info(handle, &info);
100 if (ACPI_SUCCESS(status)) { 101 if (ACPI_SUCCESS(status)) {
101 info = buffer.pointer;
102 if (info->address == find->address) 102 if (info->address == find->address)
103 find->handle = handle; 103 find->handle = handle;
104 kfree(buffer.pointer); 104 kfree(info);
105 } 105 }
106 return AE_OK; 106 return AE_OK;
107} 107}
@@ -121,7 +121,7 @@ EXPORT_SYMBOL(acpi_get_child);
121 121
122/* Link ACPI devices with physical devices */ 122/* Link ACPI devices with physical devices */
123static void acpi_glue_data_handler(acpi_handle handle, 123static void acpi_glue_data_handler(acpi_handle handle,
124 u32 function, void *context) 124 void *context)
125{ 125{
126 /* we provide an empty handler */ 126 /* we provide an empty handler */
127} 127}