lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'acpi-fixes'

Browse Source 
* acpi-fixes:
  ACPI / scan: Fix memory leak on acpi_scan_init_hotplug() error path
This commit is contained in:
Rafael J. Wysocki
2013-05-16 10:58:52 +02:00
parent e50caa954b 7a26b53070
commit 49a9e4315d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/acpi/scan.c
View File

@@ -1785,7 +1785,7 @@ static void acpi_scan_init_hotplug(acpi_handle handle, int type)
acpi_set_pnp_ids(handle, &pnp, type); acpi_set_pnp_ids(handle, &pnp, type);
if (!pnp.type.hardware_id) if (!pnp.type.hardware_id)
return; goto out;
/* /*
* This relies on the fact that acpi_install_notify_handler() will not * 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); acpi_free_pnp_ids(&pnp);
} }