Merge branch 'acpi-fixes'

* acpi-fixes: ACPI / scan: Fix memory leak on acpi_scan_init_hotplug() error path
mariux64 · May 16, 2013 · 49a9e43 · 49a9e43
2 parents e50caa9 + 7a26b53
commit 49a9e43
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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);
 }