diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-05-16 10:58:52 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-05-16 10:58:52 +0200 |
| commit | 49a9e4315d40e1ba1d3258ea33f3948254038455 (patch) | |
| tree | b3cf16fe536e5c5c0233378193041944b22b6890 | |
| parent | e50caa954b14be650ccb95260debcb929ae1f3c7 (diff) | |
| parent | 7a26b53070f0099dfcfc9d499458de861c5c4859 (diff) | |
Merge branch 'acpi-fixes'
* acpi-fixes:
ACPI / scan: Fix memory leak on acpi_scan_init_hotplug() error path
| -rw-r--r-- | drivers/acpi/scan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index fe158fd4f1d..c1bc608339a 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); } |