diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c
index 7fc4c5f..36147cd 100644
--- a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c
+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c
@@ -385,6 +385,12 @@
 		return -ENODEV;
 	}
 
+	/* Can't do devfreq without this table */
+	if (!kbdev->dev_opp_table) {
+		dev_err(kbdev->dev, "Uninitialized devfreq opp table\n");
+		return -ENODEV;
+	}
+
 	kbdev->current_freq = clk_get_rate(kbdev->clock);
 	kbdev->current_nominal_freq = kbdev->current_freq;
 
diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
index 948a4a8..b25e70c 100644
--- a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
@@ -3175,17 +3175,13 @@
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0)) && defined(CONFIG_OF) \
 			&& defined(CONFIG_REGULATOR)
 	for (i = 0; i < kbdev->regulator_num; i++) {
-		kbdev->regulator[i] = regulator_get_optional(kbdev->dev, reg_names[i]);
-		if (IS_ERR_OR_NULL(kbdev->regulator[i])) {
+		kbdev->regulator[i] = regulator_get(kbdev->dev, reg_names[i]);
+		if (IS_ERR(kbdev->regulator[i])) {
 			err = PTR_ERR(kbdev->regulator[i]);
 			kbdev->regulator[i] = NULL;
-			if (err == -EPROBE_DEFER) {
+			if (err != -EPROBE_DEFER)
 				dev_err(&pdev->dev, "Failed to get regulator\n");
-				goto fail;
-			}
-			dev_info(kbdev->dev,
-				"Continuing without %s regulator control\n", reg_names[i]);
-			/* Allow probe to continue without regulator */
+			goto fail;
 		}
 	}
 #endif /* LINUX_VERSION_CODE >= 3, 12, 0 */
@@ -3212,7 +3208,7 @@
 	if (IS_ERR(kbdev->dev_opp_table)) {
 		err = PTR_ERR(kbdev->dev_opp_table);
 		kbdev->dev_opp_table = NULL;
-		dev_err(kbdev->dev, "Failed to set regulators for GPU err: %d\n",
+		dev_err(kbdev->dev, "Failed to init devfreq opp table: %d\n",
 			err);
 	}
 #endif /* CONFIG_REGULATOR */