1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 7d2edf143f16..25d2161ae9d9 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -604,14 +604,17 @@ static int handle_eject_request(struct dock_station *ds, u32 event)
 static void dock_notify(acpi_handle handle, u32 event, void *data)
 {
         struct dock_station *ds = data;
+        struct acpi_device *tmp;
 
         switch (event) {
         case ACPI_NOTIFY_BUS_CHECK:
-                if (!dock_in_progress(ds) && dock_present(ds)) {
+                if (!dock_in_progress(ds) && acpi_bus_get_device(ds->handle,
+                   &tmp)) {
                         begin_dock(ds);
                         dock(ds);
                         if (!dock_present(ds)) {
                                 printk(KERN_ERR PREFIX "Unable to dock!\n");
+                                complete_dock(ds);
                                 break;
                         }
                         atomic_notifier_call_chain(&dock_notifier_list,