1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index fa44fb96fc34..1e872e79db33 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -834,7 +834,7 @@ static int dock_add(acpi_handle handle)
                 goto dock_add_err;
         }
 
-        printk(KERN_INFO PREFIX "%s \n", ACPI_DOCK_DRIVER_DESCRIPTION);
+        printk(KERN_INFO PREFIX "%s\n", ACPI_DOCK_DRIVER_DESCRIPTION);
 
         return 0;
 
@@ -917,6 +917,12 @@ static int __init dock_init(void)
 
         dock_station = NULL;
 
+        if (acpi_disabled)
+                return 0;
+
+        if (acpi_disabled)
+                return 0;
+
         /* look for a dock station */
         acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
                             ACPI_UINT32_MAX, find_dock, &num, NULL);