diff --git a/drivers/gpu/msm/adreno.c b/drivers/gpu/msm/adreno.c
index 514865058377..a66b96a138b2 100644
--- a/drivers/gpu/msm/adreno.c
+++ b/drivers/gpu/msm/adreno.c
@@ -1023,9 +1023,11 @@ l3_pwrlevel_probe(struct kgsl_device *device, struct device_node *node)
 
 	device->l3_clk = devm_clk_get(&device->pdev->dev, "l3_vote");
 
-	if (IS_ERR_OR_NULL(device->l3_clk))
+	if (IS_ERR_OR_NULL(device->l3_clk)) {
 		dev_err(&device->pdev->dev,
 			"Unable to get the l3_vote clock\n");
+		device->l3_clk = NULL;
+	}
 }
 
 static int adreno_of_get_power(struct adreno_device *adreno_dev,
diff --git a/drivers/gpu/msm/adreno_a6xx_gmu.c b/drivers/gpu/msm/adreno_a6xx_gmu.c
index ecc5461e2ee7..7702225eabf2 100644
--- a/drivers/gpu/msm/adreno_a6xx_gmu.c
+++ b/drivers/gpu/msm/adreno_a6xx_gmu.c
@@ -2062,7 +2062,7 @@ static int a6xx_gmu_enable_clks(struct adreno_device *adreno_dev)
 	}
 
 	ret = a6xx_gmu_clk_set_rate(gmu, "hub_clk", 150000000);
-	if (ret && ret != ENODEV) {
+	if (ret && ret != -ENODEV) {
 		dev_err(&gmu->pdev->dev, "Unable to set the HUB clock\n");
 		return ret;
 	}
diff --git a/drivers/gpu/msm/adreno_ringbuffer.c b/drivers/gpu/msm/adreno_ringbuffer.c
index b7d134929625..1b2a13e5e901 100644
--- a/drivers/gpu/msm/adreno_ringbuffer.c
+++ b/drivers/gpu/msm/adreno_ringbuffer.c
@@ -753,7 +753,7 @@ static void adreno_ringbuffer_set_constraint(struct kgsl_device *device,
 		((context->flags & KGSL_CONTEXT_PWR_CONSTRAINT) ||
 			(flags & KGSL_CONTEXT_PWR_CONSTRAINT))) {
 
-		if (IS_ERR_OR_NULL(device->l3_clk)) {
+		if (device->l3_clk == NULL) {
 			dev_err_once(device->dev,
 				"l3_vote clk not available\n");
 			return;