diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/common/linux/driver_common.c
index 695bb3072..62596d495 100644
--- a/drivers/gpu/nvgpu/common/linux/driver_common.c
+++ b/drivers/gpu/nvgpu/common/linux/driver_common.c
@@ -221,6 +221,11 @@ int nvgpu_probe(struct gk20a *g,
 	nvgpu_init_pm_vars(g);
 	nvgpu_init_vbios_vars(g);
 	nvgpu_init_ltc_vars(g);
+	err = nvgpu_init_soc_vars(g);
+	if (err) {
+		nvgpu_err(g, "init soc vars failed");
+		return err;
+	}
 
 	/* Initialize the platform interface. */
 	err = platform->probe(dev);
diff --git a/drivers/gpu/nvgpu/common/linux/pci.c b/drivers/gpu/nvgpu/common/linux/pci.c
index 922792d7e..c57674eeb 100644
--- a/drivers/gpu/nvgpu/common/linux/pci.c
+++ b/drivers/gpu/nvgpu/common/linux/pci.c
@@ -45,7 +45,7 @@
 
 static int nvgpu_pci_tegra_probe(struct device *dev)
 {
-	return nvgpu_init_soc_vars(get_gk20a(dev));
+	return 0;
 }
 
 static int nvgpu_pci_tegra_remove(struct device *dev)