aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/dock.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/dock.c')
-rw-r--r--drivers/acpi/dock.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index efb959d6c8a9..3a2cfefc71ab 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -33,6 +33,8 @@
33#include <acpi/acpi_bus.h> 33#include <acpi/acpi_bus.h>
34#include <acpi/acpi_drivers.h> 34#include <acpi/acpi_drivers.h>
35 35
36#define PREFIX "ACPI: "
37
36#define ACPI_DOCK_DRIVER_DESCRIPTION "ACPI Dock Station Driver" 38#define ACPI_DOCK_DRIVER_DESCRIPTION "ACPI Dock Station Driver"
37 39
38ACPI_MODULE_NAME("dock"); 40ACPI_MODULE_NAME("dock");
@@ -231,18 +233,16 @@ static int is_ata(acpi_handle handle)
231static int is_battery(acpi_handle handle) 233static int is_battery(acpi_handle handle)
232{ 234{
233 struct acpi_device_info *info; 235 struct acpi_device_info *info;
234 struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
235 int ret = 1; 236 int ret = 1;
236 237
237 if (!ACPI_SUCCESS(acpi_get_object_info(handle, &buffer))) 238 if (!ACPI_SUCCESS(acpi_get_object_info(handle, &info)))
238 return 0; 239 return 0;
239 info = buffer.pointer;
240 if (!(info->valid & ACPI_VALID_HID)) 240 if (!(info->valid & ACPI_VALID_HID))
241 ret = 0; 241 ret = 0;
242 else 242 else
243 ret = !strcmp("PNP0C0A", info->hardware_id.value); 243 ret = !strcmp("PNP0C0A", info->hardware_id.string);
244 244
245 kfree(buffer.pointer); 245 kfree(info);
246 return ret; 246 return ret;
247} 247}
248 248