diff options
| author |   Dave Airlie <airlied@redhat.com> | 2025-04-03 15:46:21 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2025-04-03 15:46:30 +1000 |
| commit | 889f32b4d7bf686ee4561b8139b8a66d11eb88d0 (patch) | |
| tree | ac78eb769d293982b1089d6c27e898be918e5162 | |
| parent | Merge tag 'drm-intel-gt-next-2025-03-12' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-next (diff) | |
| parent | drm: adp: Fix NULL vs IS_ERR() check in adp_plane_new() (diff) | |
| download | wireguard-linux-889f32b4d7bf686ee4561b8139b8a66d11eb88d0.tar.xz wireguard-linux-889f32b4d7bf686ee4561b8139b8a66d11eb88d0.zip | |
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
| -rw-r--r-- | drivers/gpu/drm/adp/adp_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/adp/adp_drv.c b/drivers/gpu/drm/adp/adp_drv.c index 0eeb9e5fab26..c98c647f981d 100644 --- a/drivers/gpu/drm/adp/adp_drv.c +++ b/drivers/gpu/drm/adp/adp_drv.c @@ -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); |