Skip to content

Commit 889f32b

Browse files
committed
Merge tag 'drm-misc-next-fixes-2025-03-27' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
Short summary of fixes pull: adp: - Fix error handling in plane setup Signed-off-by: Dave Airlie <airlied@redhat.com> From: Thomas Zimmermann <tzimmermann@suse.de> Link: https://lore.kernel.org/r/20250327141835.GA96037@linux.fritz.box
2 parents cf05922 + ee20c69 commit 889f32b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/gpu/drm/adp/adp_drv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,9 @@ static struct drm_plane *adp_plane_new(struct adp_drv_private *adp)
232232
ALL_CRTCS, &adp_plane_funcs,
233233
plane_formats, ARRAY_SIZE(plane_formats),
234234
NULL, DRM_PLANE_TYPE_PRIMARY, "plane");
235-
if (!plane) {
235+
if (IS_ERR(plane)) {
236236
drm_err(drm, "failed to allocate plane");
237-
return ERR_PTR(-ENOMEM);
237+
return plane;
238238
}
239239

240240
drm_plane_helper_add(plane, &adp_plane_helper_funcs);

0 commit comments

Comments
 (0)