---

yaml --- r: 272014 b: refs/heads/master c: 023b956 h: refs/heads/master v: v3
git-mirror · Oct 24, 2011 · 8c6a0f5 · 8c6a0f5
1 parent a81b93b
commit 8c6a0f5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 349d594be45bdc7a86a08385f2f4f49d08ab68dd
+refs/heads/master: 023b9565972a4a5e0f01b9aa32680af6e9b5c388
diff --git a/trunk/drivers/platform/x86/wmi.c b/trunk/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)