3 files changed, 19 insertions, 4 deletions

diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 0c789224d40d..f774c65ecb8b 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -287,6 +287,7 @@ EXPORT_SYMBOL_GPL(acpi_unbind_one);
 static int acpi_platform_notify(struct device *dev)
 {
         struct acpi_bus_type *type = acpi_get_bus_type(dev);
+        struct acpi_device *adev;
         int ret;
 
         ret = acpi_bind_one(dev, NULL);
@@ -303,9 +304,14 @@ static int acpi_platform_notify(struct device *dev)
                 if (ret)
                         goto out;
         }
+        adev = ACPI_COMPANION(dev);
+        if (!adev)
+                goto out;
 
         if (type && type->setup)
                 type->setup(dev);
+        else if (adev->handler && adev->handler->bind)
+                adev->handler->bind(dev);
 
  out:
 #if ACPI_GLUE_DEBUG
@@ -324,11 +330,17 @@ static int acpi_platform_notify(struct device *dev)
 
 static int acpi_platform_notify_remove(struct device *dev)
 {
+        struct acpi_device *adev = ACPI_COMPANION(dev);
         struct acpi_bus_type *type;
 
+        if (!adev)
+                return 0;
+
         type = acpi_get_bus_type(dev);
         if (type && type->cleanup)
                 type->cleanup(dev);
+        else if (adev->handler && adev->handler->unbind)
+                adev->handler->unbind(dev);
 
         acpi_unbind_one(dev);
         return 0;
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 57b053f424d1..9c4581fd5827 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -2015,13 +2015,14 @@ static int acpi_scan_attach_handler(struct acpi_device *device)
 
                 handler = acpi_scan_match_handler(hwid->id, &devid);
                 if (handler) {
+                        device->handler = handler;
                         ret = handler->attach(device, devid);
-                        if (ret > 0) {
-                                device->handler = handler;
+                        if (ret > 0)
                                 break;
-                        } else if (ret < 0) {
+
+                        device->handler = NULL;
+                        if (ret < 0)
                                 break;
-                        }
                 }
         }
         return ret;
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 8256eb4ad057..c93bce469492 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -133,6 +133,8 @@ struct acpi_scan_handler {
         struct list_head list_node;
         int (*attach)(struct acpi_device *dev, const struct acpi_device_id *id);
         void (*detach)(struct acpi_device *dev);
+        void (*bind)(struct device *phys_dev);
+        void (*unbind)(struct device *phys_dev);
         struct acpi_hotplug_profile hotplug;
 };