summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorTomasz Nowicki <tomasz.nowicki@linaro.org>2013-06-08 03:00:07 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-06-16 01:04:58 +0200
commitb739f106cb6385b83bac41e1f417c4e9347171a4 (patch)
tree3259f173bab2fb663b502e283d701de37220bf61 /drivers/acpi
parentACPICA: ACPICA Termination: Delete global lock pending lock (diff)
downloadlinux-b739f106cb6385b83bac41e1f417c4e9347171a4.tar.xz
linux-b739f106cb6385b83bac41e1f417c4e9347171a4.zip
ACPICA: Fix possible memory leak in GPE init error path
Some GPE blocks were not deleted. ACPICA BZ 1018. Tomasz Nowicki <tomasz.nowicki@linaro.org> References: https://bugs.acpica.org/show_bug.cgi?id=1018 Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org> Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Reviewed-by: Len Brown <len.brown@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/acpica/evgpeblk.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/evgpeblk.c b/drivers/acpi/acpica/evgpeblk.c
index a2d688bbac02..c1aa1eda26c3 100644
--- a/drivers/acpi/acpica/evgpeblk.c
+++ b/drivers/acpi/acpica/evgpeblk.c
@@ -382,6 +382,8 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
status = acpi_ev_install_gpe_block(gpe_block, interrupt_number);
if (ACPI_FAILURE(status)) {
+ ACPI_FREE(gpe_block->register_info);
+ ACPI_FREE(gpe_block->event_info);
ACPI_FREE(gpe_block);
return_ACPI_STATUS(status);
}