2 files changed, 5 insertions, 2 deletions

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 47051cd25113..3a94b799f166 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -432,7 +432,7 @@ struct platform_device *platform_device_register_full(
                 goto err_alloc;
 
         pdev->dev.parent = pdevinfo->parent;
-        ACPI_HANDLE_SET(&pdev->dev, pdevinfo->acpi_node.handle);
+        ACPI_COMPANION_SET(&pdev->dev, pdevinfo->acpi_node.companion);
 
         if (pdevinfo->dma_mask) {
                 /*
@@ -463,7 +463,7 @@ struct platform_device *platform_device_register_full(
         ret = platform_device_add(pdev);
         if (ret) {
 err:
-                ACPI_HANDLE_SET(&pdev->dev, NULL);
+                ACPI_COMPANION_SET(&pdev->dev, NULL);
                 kfree(pdev->dev.dma_mask);
 
 err_alloc:
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index c12e9b9556be..1b41fca3d65a 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -1350,6 +1350,9 @@ static int device_prepare(struct device *dev, pm_message_t state)
 
         device_unlock(dev);
 
+        if (error)
+                pm_runtime_put(dev);
+
         return error;
 }