summaryrefslogtreecommitdiff
path: root/drivers/platform
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-08-26 11:14:48 +0400
committerMatthew Garrett <mjg@redhat.com>2010-10-21 17:36:46 +0400
commit2d5ab5551f38793f8977114d78a98aad138cfb4e (patch)
treeea9d19d0fefcecc8d8dc1a3ab541602bd18c68f9 /drivers/platform
parent5212cd678af82fef00f6d60d14de01c1211aad56 (diff)
downloadlinux-2d5ab5551f38793f8977114d78a98aad138cfb4e.tar.xz
WMI: free wmi blocks when parse_wdg() fails
Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/wmi.c25
1 files changed, 15 insertions, 10 deletions
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index 63d0b65deffb..8d59699f28e3 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -795,6 +795,16 @@ static bool guid_already_parsed(const char *guid_string)
return false;
}
+static void free_wmi_blocks(void)
+{
+ struct wmi_block *wblock, *next;
+
+ list_for_each_entry_safe(wblock, next, &wmi_blocks.list, list) {
+ list_del(&wblock->list);
+ kfree(wblock);
+ }
+}
+
/*
* Parse the _WDG method for the GUID data blocks
*/
@@ -853,7 +863,7 @@ static acpi_status parse_wdg(acpi_handle handle)
wblock->handle = handle;
if (debug_event) {
wblock->handler = wmi_notify_debug;
- status = wmi_method_enable(wblock, 1);
+ wmi_method_enable(wblock, 1);
}
list_add_tail(&wblock->list, &wmi_blocks.list);
}
@@ -863,6 +873,9 @@ out_free_gblock:
out_free_pointer:
kfree(out.pointer);
+ if (ACPI_FAILURE(status))
+ free_wmi_blocks();
+
return status;
}
@@ -1002,19 +1015,11 @@ static int __init acpi_wmi_init(void)
static void __exit acpi_wmi_exit(void)
{
- struct list_head *p, *tmp;
- struct wmi_block *wblock;
-
wmi_class_exit();
acpi_bus_unregister_driver(&acpi_wmi_driver);
- list_for_each_safe(p, tmp, &wmi_blocks.list) {
- wblock = list_entry(p, struct wmi_block, list);
-
- list_del(p);
- kfree(wblock);
- }
+ free_wmi_blocks();
printk(KERN_INFO PREFIX "Mapper unloaded\n");
}