Commit 889f32b4 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2025-03-27' of... 

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: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20250327141835.GA96037@linux.fritz.box
parents cf05922d ee20c69c

drivers/gpu/drm/adp/adp_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -232,9 +232,9 @@ static struct drm_plane *adp_plane_new(struct adp_drv_private *adp) 
					     ALL_CRTCS, &adp_plane_funcs,

					     plane_formats, ARRAY_SIZE(plane_formats),

					     NULL, DRM_PLANE_TYPE_PRIMARY, "plane");

	if (!plane) {

	if (IS_ERR(plane)) {

		drm_err(drm, "failed to allocate plane");

		return ERR_PTR(-ENOMEM);

		return plane;

	}



	drm_plane_helper_add(plane, &adp_plane_helper_funcs);