---

yaml --- r: 210983 b: refs/heads/master c: d9bca43 h: refs/heads/master i: 210981: 9751f52 210979: af4a427 210975: b1368f6 v: v3
git-mirror · Sep 24, 2010 · 13a8696 · 13a8696
1 parent c980ddc
commit 13a8696
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89a3fd35ba0318a7208e2c8d8ca6189f567d4a93
+refs/heads/master: d9bca4358286584cc22f4261ee3a60cad01aa4d4
diff --git a/trunk/drivers/hwmon/pkgtemp.c b/trunk/drivers/hwmon/pkgtemp.c
@@ -339,17 +339,18 @@ static int __cpuinit pkgtemp_device_add(unsigned int cpu)
 #ifdef CONFIG_HOTPLUG_CPU
 static void pkgtemp_device_remove(unsigned int cpu)
 {
-	struct pdev_entry *p, *n;
+	struct pdev_entry *p;
 	unsigned int i;
 	int err;
 
 	mutex_lock(&pdev_list_mutex);
-	list_for_each_entry_safe(p, n, &pdev_list, list) {
+	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_core_mask(cpu)) {
 			if (i != cpu) {
@@ -358,7 +359,7 @@ static void pkgtemp_device_remove(unsigned int cpu)
 					break;
 			}
 		}
-		break;
+		return;
 	}
 	mutex_unlock(&pdev_list_mutex);
 }