Merge branch 'acpi-fixes'
* acpi-fixes: ACPI / scan: Fix memory leak on acpi_scan_init_hotplug() error path
This commit is contained in:
commit
49a9e4315d
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue