From f048c899cc7082e40307e274e0fd08c75c55a23d Mon Sep 17 00:00:00 2001 From: Holger Macht Date: Tue, 20 Jan 2009 12:18:24 +0100 Subject: [PATCH] --- yaml --- r: 131095 b: refs/heads/master c: fc5a9f8841ee87d93376ada5d73117d4d6a373ea h: refs/heads/master i: 131093: cb0acd5830486b3450ebe1eb324c619867ec6444 131091: 518f5812459ec8b2419a1cf31afeb5b7ab99e23f 131087: c66978175cc36e7dfc388c886cd03e5745eb47a2 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/dock.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 992899c7da4a..0737ff9aac58 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e3a9d1ed8cc8db93e5c53e9a5b09065bd95de8b +refs/heads/master: fc5a9f8841ee87d93376ada5d73117d4d6a373ea diff --git a/trunk/drivers/acpi/dock.c b/trunk/drivers/acpi/dock.c index 5b30b8d91d71..afd5db3c7562 100644 --- a/trunk/drivers/acpi/dock.c +++ b/trunk/drivers/acpi/dock.c @@ -855,10 +855,14 @@ find_dock_devices(acpi_handle handle, u32 lvl, void *context, void **rv) static ssize_t show_docked(struct device *dev, struct device_attribute *attr, char *buf) { + struct acpi_device *tmp; + struct dock_station *dock_station = *((struct dock_station **) dev->platform_data); - return snprintf(buf, PAGE_SIZE, "%d\n", dock_present(dock_station)); + if (ACPI_SUCCESS(acpi_bus_get_device(dock_station->handle, &tmp))) + return snprintf(buf, PAGE_SIZE, "1\n"); + return snprintf(buf, PAGE_SIZE, "0\n"); } static DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL);