Merge branch 'pm-cpuidle'

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / dock.c

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index f601658a4ad2856464b0e137694b75c29d04d0f5..05ea4be01a832ccb3d8b38e4318c66fee0f83a89 100644 (file)
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -881,8 +881,10 @@ static int __init dock_add(acpi_handle handle)
 
        status = acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
                                             dock_notify_handler, dock_station);
-       if (ACPI_FAILURE(status))
+       if (ACPI_FAILURE(status)) {
+               ret = -ENODEV;
                goto err_rmgroup;
+       }
 
        dock_station_count++;
        list_add(&dock_station->sibling, &dock_stations);
@@ -906,7 +908,7 @@ err_unregister:
  *
  * This is called by acpi_walk_namespace to look for dock stations and bays.
  */
-static __init acpi_status
+static acpi_status __init
 find_dock_and_bay(acpi_handle handle, u32 lvl, void *context, void **rv)
 {
        if (acpi_dock_match(handle) || is_ejectable_bay(handle))