diff --git a/chip/lm4/peci.c b/chip/lm4/peci.c
index 732a45b24d..f3479821e2 100644
--- a/chip/lm4/peci.c
+++ b/chip/lm4/peci.c
@@ -53,12 +53,10 @@ int peci_get_cpu_temp(void)
 
 int peci_temp_sensor_poll(void)
 {
-	int val = peci_get_cpu_temp();
+	last_temp_val = peci_get_cpu_temp();
 
-	if (val > 0) {
-		last_temp_val = val;
+	if (last_temp_val > 0)
 		return EC_SUCCESS;
-	}
 	else
 		return EC_ERROR_UNKNOWN;
 }
diff --git a/common/thermal.c b/common/thermal.c
index b1f492e408..63b28aae53 100644
--- a/common/thermal.c
+++ b/common/thermal.c
@@ -144,10 +144,8 @@ static void thermal_process(void)
 			continue;
 
 		cur_temp = temp_sensor_read(i);
+
 		/* Sensor failure. */
-		/* TODO: PECI temperature sensor is currently flaky and thus
-		 * sensor failure is now ignored. Change this when we have
-		 * reliable PECI temperature sensor. */
 		if (cur_temp == -1) {
 			if (flag & THERMAL_CONFIG_WARNING_ON_FAIL)
 				smi_sensor_failure_warning();