Skip to content

Commit

Permalink
x86/hwmon: fix initialization of pkgtemp
Browse files Browse the repository at this point in the history
Feature availability should also be checked in the hotplug code path.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
  • Loading branch information
Jan Beulich authored and Guenter Roeck committed Sep 24, 2010
1 parent a465905 commit f6aeccd
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions drivers/hwmon/pkgtemp.c
Original file line number Diff line number Diff line change
Expand Up @@ -284,9 +284,10 @@ static int __cpuinit pkgtemp_device_add(unsigned int cpu)
int err;
struct platform_device *pdev;
struct pdev_entry *pdev_entry;
#ifdef CONFIG_SMP
struct cpuinfo_x86 *c = &cpu_data(cpu);
#endif

if (!cpu_has(c, X86_FEATURE_PTS))
return 0;

mutex_lock(&pdev_list_mutex);

Expand Down Expand Up @@ -403,11 +404,6 @@ static int __init pkgtemp_init(void)
goto exit;

for_each_online_cpu(i) {
struct cpuinfo_x86 *c = &cpu_data(i);

if (!cpu_has(c, X86_FEATURE_PTS))
continue;

err = pkgtemp_device_add(i);
if (err)
goto exit_devices_unreg;
Expand Down

0 comments on commit f6aeccd

Please sign in to comment.