diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
index 3c960b999958b4b7fa842a32c0f8f2d783a1109a..e1c10b9ec4678f4458b8f5e3fe0d555410809579 100644
--- a/drivers/hwmon/via-cputemp.c
+++ b/drivers/hwmon/via-cputemp.c
@@ -230,6 +230,13 @@ static int via_cputemp_online(unsigned int cpu)
 	struct platform_device *pdev;
 	struct pdev_entry *pdev_entry;
 
+	/*
+	 * Don't execute this on suspend as the device remove locks
+	 * up the machine.
+	 */
+	if (cpuhp_tasks_frozen)
+		return 0;
+
 	pdev = platform_device_alloc(DRVNAME, cpu);
 	if (!pdev) {
 		err = -ENOMEM;
@@ -269,6 +276,13 @@ static int via_cputemp_down_prep(unsigned int cpu)
 {
 	struct pdev_entry *p;
 
+	/*
+	 * Don't execute this on suspend as the device remove locks
+	 * up the machine.
+	 */
+	if (cpuhp_tasks_frozen)
+		return 0;
+
 	mutex_lock(&pdev_list_mutex);
 	list_for_each_entry(p, &pdev_list, list) {
 		if (p->cpu == cpu) {
diff --git a/drivers/hwmon/zhaoxin-cputemp.c b/drivers/hwmon/zhaoxin-cputemp.c
index 8b88228a334deea778f766ae0a95cf1b1a9b0cb3..2a69b22b86fac3b5a15cb579504e0397e7a4cc61 100644
--- a/drivers/hwmon/zhaoxin-cputemp.c
+++ b/drivers/hwmon/zhaoxin-cputemp.c
@@ -201,6 +201,13 @@ static int zhaoxin_cputemp_online(unsigned int cpu)
 	struct platform_device *pdev;
 	struct pdev_entry *pdev_entry;
 
+	/*
+	 * Don't execute this on suspend as the device remove locks
+	 * up the machine.
+	 */
+	if (cpuhp_tasks_frozen)
+		return 0;
+
 	pdev = platform_device_alloc(DRVNAME, cpu);
 	if (!pdev) {
 		err = -ENOMEM;
@@ -240,6 +247,13 @@ static int zhaoxin_cputemp_down_prep(unsigned int cpu)
 {
 	struct pdev_entry *p;
 
+	/*
+	 * Don't execute this on suspend as the device remove locks
+	 * up the machine.
+	 */
+	if (cpuhp_tasks_frozen)
+		return 0;
+
 	mutex_lock(&pdev_list_mutex);
 	list_for_each_entry(p, &pdev_list, list) {
 		if (p->cpu == cpu) {