---

yaml --- r: 210987 b: refs/heads/master c: e40cc4b h: refs/heads/master i: 210985: 4993b87 210983: 13a8696 v: v3
git-mirror · Sep 24, 2010 · 98d8e00 · 98d8e00
1 parent d95e192
commit 98d8e00
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6aeccdb96fc0555e939dd507702922f07dcbcbb
+refs/heads/master: e40cc4bdfd4b89813f072f72bd9c7055814d3f0f
diff --git a/trunk/drivers/hwmon/coretemp.c b/trunk/drivers/hwmon/coretemp.c
@@ -491,14 +491,22 @@ static int __cpuinit coretemp_device_add(unsigned int cpu)
 
 static void coretemp_device_remove(unsigned int cpu)
 {
-	struct pdev_entry *p, *n;
+	struct pdev_entry *p;
+	unsigned int i;
+
 	mutex_lock(&pdev_list_mutex);
-	list_for_each_entry_safe(p, n, &pdev_list, list) {
-		if (p->cpu == cpu) {
-			platform_device_unregister(p->pdev);
-			list_del(&p->list);
-			kfree(p);
-		}
+	list_for_each_entry(p, &pdev_list, list) {
+		if (p->cpu != cpu)
+			continue;
+
+		platform_device_unregister(p->pdev);
+		list_del(&p->list);
+		mutex_unlock(&pdev_list_mutex);
+		kfree(p);
+		for_each_cpu(i, cpu_sibling_mask(cpu))
+			if (i != cpu && !coretemp_device_add(i))
+				break;
+		return;
 	}
 	mutex_unlock(&pdev_list_mutex);
 }