diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
index 0a5057dbe51a63fae6b5a92e22e3ee630a129927..c79fa618efafb4d86a1e8bc9a49fa1a2f236ea9f 100644
--- a/drivers/hwmon/via-cputemp.c
+++ b/drivers/hwmon/via-cputemp.c
@@ -216,6 +216,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;
@@ -255,6 +262,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) {