Merge branch 'acpi-fixes'

* acpi-fixes:
  ACPI / scan: Fix memory leak on acpi_scan_init_hotplug() error path

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index fe158fd4f1df..c1bc608339a6 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1785,7 +1785,7 @@ static void acpi_scan_init_hotplug(acpi_handle handle, int type)
         acpi_set_pnp_ids(handle, &pnp, type);
 
         if (!pnp.type.hardware_id)
-                return;
+                goto out;
 
         /*
          * This relies on the fact that acpi_install_notify_handler() will not
@@ -1800,6 +1800,7 @@ static void acpi_scan_init_hotplug(acpi_handle handle, int type)
                 }
         }
 
+out:
         acpi_free_pnp_ids(&pnp);
 }