From c980ddccbf6abdc5f6ab725406aedeff71adc3ce Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@novell.com>
Date: Mon, 13 Sep 2010 10:05:51 +0000
Subject: [PATCH] --- yaml --- r: 210982 b: refs/heads/master c:
 89a3fd35ba0318a7208e2c8d8ca6189f567d4a93 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/hwmon/coretemp.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c5e5911a07fd..089edce4a12b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7c77a3dc4683659b6f0d1b6cbc82b6253d095e0
+refs/heads/master: 89a3fd35ba0318a7208e2c8d8ca6189f567d4a93
diff --git a/trunk/drivers/hwmon/coretemp.c b/trunk/drivers/hwmon/coretemp.c
index de8111114f46..6b3ef553bd13 100644
--- a/trunk/drivers/hwmon/coretemp.c
+++ b/trunk/drivers/hwmon/coretemp.c
@@ -541,16 +541,19 @@ static int __init coretemp_init(void)
 				" has no thermal sensor.\n", c->x86_model);
 		}
 	}
+
+#ifndef CONFIG_HOTPLUG_CPU
 	if (list_empty(&pdev_list)) {
 		err = -ENODEV;
 		goto exit_driver_unreg;
 	}
+#endif
 
 	register_hotcpu_notifier(&coretemp_cpu_notifier);
 	return 0;
 
-exit_driver_unreg:
 #ifndef CONFIG_HOTPLUG_CPU
+exit_driver_unreg:
 	platform_driver_unregister(&coretemp_driver);
 #endif
 exit: