Merge 3.14-rc4 into tty-next

We want the tty revert here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index e9b3081c4fe9..5bfd769fc91f 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -713,13 +713,11 @@ static acpi_status __init find_dock_devices(acpi_handle handle, u32 lvl,
 static ssize_t show_docked(struct device *dev,
                            struct device_attribute *attr, char *buf)
 {
-        struct acpi_device *tmp;
-
         struct dock_station *dock_station = dev->platform_data;
+        struct acpi_device *adev = NULL;
 
-        if (!acpi_bus_get_device(dock_station->handle, &tmp))
-                return snprintf(buf, PAGE_SIZE, "1\n");
-        return snprintf(buf, PAGE_SIZE, "0\n");
+        acpi_bus_get_device(dock_station->handle, &adev);
+        return snprintf(buf, PAGE_SIZE, "%u\n", acpi_device_enumerated(adev));
 }
 static DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL);