diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-09-07 15:00:02 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-11 09:36:09 -0800 |
| commit | cf541bb3f2532e7493720a208021e43b85156870 (patch) | |
| tree | d98f26c92587c96280e205d9670724d2d6a5ebba /drivers/platform | |
| parent | 761f2b411806f70dfaa3d248b4182e7ba154efd4 (diff) | |
| download | kernel_samsung_smdk4412-cf541bb3f2532e7493720a208021e43b85156870.zip kernel_samsung_smdk4412-cf541bb3f2532e7493720a208021e43b85156870.tar.gz kernel_samsung_smdk4412-cf541bb3f2532e7493720a208021e43b85156870.tar.bz2 | |
WMI: properly cleanup devices to avoid crashes
commit 023b9565972a4a5e0f01b9aa32680af6e9b5c388 upstream.
We need to remove devices that we destroy from the list, otherwise
we'll crash if there are more than one "_WDG" methods in DSDT.
This fixes https://bugzilla.kernel.org/show_bug.cgi?id=32052
Tested-by: Ilya Tumaykin <librarian_rus@yahoo.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Acked-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/wmi.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index f23d5a8..9b88be4 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c @@ -754,9 +754,13 @@ static void wmi_free_devices(void) struct wmi_block *wblock, *next; /* Delete devices for all the GUIDs */ - list_for_each_entry_safe(wblock, next, &wmi_block_list, list) + list_for_each_entry_safe(wblock, next, &wmi_block_list, list) { + list_del(&wblock->list); if (wblock->dev.class) device_unregister(&wblock->dev); + else + kfree(wblock); + } } static bool guid_already_parsed(const char *guid_string) |