From 13a8696ce326fa18c9f6cb37e719e3c305d02218 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Mon, 13 Sep 2010 10:11:05 +0000 Subject: [PATCH] --- yaml --- r: 210983 b: refs/heads/master c: d9bca4358286584cc22f4261ee3a60cad01aa4d4 h: refs/heads/master i: 210981: 9751f5296ae7379c44b434762c53f9f58f3e6ec7 210979: af4a427c9fc9b1bb97c3353502054c6bdee3b2a0 210975: b1368f62090c25994437f29e69b23fed619336fb v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/pkgtemp.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 089edce4a12b..5312f13c5b5e 100644 --- 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 index 74157fcda6ed..844957333fe5 100644 --- 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); }