diff --git a/drivers/gpu/drm/apple/dcp_backlight.c b/drivers/gpu/drm/apple/dcp_backlight.c
index 42b1097eaa0180..d063ecd7ad2068 100644
--- a/drivers/gpu/drm/apple/dcp_backlight.c
+++ b/drivers/gpu/drm/apple/dcp_backlight.c
@@ -165,21 +165,28 @@ static int drm_crtc_set_brightness(struct drm_crtc *crtc,
 
 static int dcp_set_brightness(struct backlight_device *bd)
 {
-	int ret;
+	int ret = 0;
 	struct apple_dcp *dcp = bl_get_data(bd);
 	struct drm_modeset_acquire_ctx ctx;
+	int brightness = backlight_get_brightness(bd);
 
-	if (bd->props.state & BL_CORE_SUSPENDED)
-		return 0;
-
-	if (!dcp->crtc)
-		return -EAGAIN;
+	DRM_MODESET_LOCK_ALL_BEGIN(dcp->crtc->base.dev, ctx, 0, ret);
 
-	dcp->brightness.dac = calculate_dac(dcp, bd->props.brightness);
+	dcp->brightness.dac = calculate_dac(dcp, brightness);
 	dcp->brightness.update = true;
 
-	DRM_MODESET_LOCK_ALL_BEGIN(dcp->crtc->base.dev, ctx, 0, ret);
+	/*
+	 * Do not actively try to change brightness if no mode is set.
+	 * TODO: should this be reflected the in backlight's power property?
+	 *       defer this hopefully until it becomes irrelevant due to proper
+	 *       drm integrated backlight handling
+	 */
+	if (!dcp->valid_mode)
+		goto out;
+
 	ret = drm_crtc_set_brightness(&dcp->crtc->base, &ctx);
+
+out:
 	DRM_MODESET_LOCK_ALL_END(dcp->crtc->base.dev, ctx, ret);
 
 	return ret;
diff --git a/drivers/gpu/drm/apple/parser.c b/drivers/gpu/drm/apple/parser.c
index 678c0e42e10682..5665c2ba19682f 100644
--- a/drivers/gpu/drm/apple/parser.c
+++ b/drivers/gpu/drm/apple/parser.c
@@ -229,7 +229,7 @@ static int parse_dimension(struct dcp_parse_ctx *handle, struct dimension *dim)
 		char *key = parse_string(it.handle);
 
 		if (IS_ERR(key))
-			ret = PTR_ERR(handle);
+			ret = PTR_ERR(key);
 		else if (!strcmp(key, "Active"))
 			ret = parse_int(it.handle, &dim->active);
 		else if (!strcmp(key, "Total"))
@@ -243,6 +243,9 @@ static int parse_dimension(struct dcp_parse_ctx *handle, struct dimension *dim)
 		else
 			skip(it.handle);
 
+		if (!IS_ERR_OR_NULL(key))
+			kfree(key);
+
 		if (ret)
 			return ret;
 	}
@@ -298,6 +301,9 @@ static int parse_color_modes(struct dcp_parse_ctx *handle, s64 *preferred_id)
 			else
 				skip(it.handle);
 
+			if (!IS_ERR_OR_NULL(key))
+				kfree(key);
+
 			if (ret)
 				return ret;
 		}
@@ -381,6 +387,9 @@ static int parse_mode(struct dcp_parse_ctx *handle,
 		else
 			skip(it.handle);
 
+		if (!IS_ERR_OR_NULL(key))
+			kfree(key);
+
 		if (ret)
 			return ret;
 	}
@@ -511,6 +520,9 @@ int parse_display_attributes(struct dcp_parse_ctx *handle, int *width_mm,
 		else
 			skip(it.handle);
 
+		if (!IS_ERR_OR_NULL(key))
+			kfree(key);
+
 		if (ret)
 			return ret;
 	}