2 files changed, 8 insertions, 0 deletions
diff --git a/src/soc/intel/skylake/cpu.c b/src/soc/intel/skylake/cpu.c
index 3733fe000c..7a66ed0e33 100644
--- a/src/soc/intel/skylake/cpu.c
+++ b/src/soc/intel/skylake/cpu.c
@@ -290,6 +290,10 @@ static void configure_isst(void)
 static void configure_misc(void)
 {
 	struct device *dev = SA_DEV_ROOT;
+	if (!dev) {
+		printk(BIOS_ERR, "SA_DEV_ROOT device not found!\n");
+		return;
+	}
 	config_t *conf = dev->chip_info;
 	msr_t msr;
 
diff --git a/src/soc/intel/skylake/thermal.c b/src/soc/intel/skylake/thermal.c
index 01a4f26259..c1b4ce31d4 100644
--- a/src/soc/intel/skylake/thermal.c
+++ b/src/soc/intel/skylake/thermal.c
@@ -83,6 +83,10 @@ void pch_thermal_configuration(void)
 {
 	uint16_t reg16;
 	struct device *dev = PCH_DEV_THERMAL;
+	if (!dev) {
+		printk(BIOS_ERR, "PCH_DEV_THERMAL device not found!\n");
+		return;
+	}
 	void *thermalbar = pch_thermal_get_bar(dev);
 
 	/* Use default pre-ram bar */