Commit 0dca94ba authored by Chen Gong's avatar Chen Gong Committed by Linus Torvalds

hwmon: coretemp: update hotplug condition check

Fix two errors in hotplug.  One is for hotplug notifier.  The other is
unnecessary driver unregister.  Because even none of online cpus supports
coretemp, we can't assume new onlined cpu doesn't support it either.  If
related driver is unregistered there we have no chance to use coretemp
from then on.
Signed-off-by: default avatarChen Gong <gong.chen@linux.intel.com>
Cc: Rudolf Marek <r.marek@assembler.cz>
Cc: Huaxu Wan <huaxu.wan@intel.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: Guenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4453d736
...@@ -502,10 +502,13 @@ static int __cpuinit coretemp_cpu_callback(struct notifier_block *nfb, ...@@ -502,10 +502,13 @@ static int __cpuinit coretemp_cpu_callback(struct notifier_block *nfb,
switch (action) { switch (action) {
case CPU_ONLINE: case CPU_ONLINE:
case CPU_ONLINE_FROZEN:
case CPU_DOWN_FAILED: case CPU_DOWN_FAILED:
case CPU_DOWN_FAILED_FROZEN:
coretemp_device_add(cpu); coretemp_device_add(cpu);
break; break;
case CPU_DOWN_PREPARE: case CPU_DOWN_PREPARE:
case CPU_DOWN_PREPARE_FROZEN:
coretemp_device_remove(cpu); coretemp_device_remove(cpu);
break; break;
} }
...@@ -566,7 +569,9 @@ static int __init coretemp_init(void) ...@@ -566,7 +569,9 @@ static int __init coretemp_init(void)
} }
mutex_unlock(&pdev_list_mutex); mutex_unlock(&pdev_list_mutex);
exit_driver_unreg: exit_driver_unreg:
#ifndef CONFIG_HOTPLUG_CPU
platform_driver_unregister(&coretemp_driver); platform_driver_unregister(&coretemp_driver);
#endif
exit: exit:
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment