summaryrefslogtreecommitdiff
path: root/lib/debugobjects.c
diff options
context:
space:
mode:
authorThomas Hellström <thomas.hellstrom@linux.intel.com>2026-05-08 16:19:45 +0200
committerThomas Hellström <thomas.hellstrom@linux.intel.com>2026-05-08 16:19:45 +0200
commitc53ed3e99920df6a90553c89a1c053aa0776841e (patch)
tree321444569239160a91ad0dfe2e457dd291316640 /lib/debugobjects.c
parent23fb2ea56cb4fa2587bc072b04e4e698687a48e4 (diff)
parentf96538285cfdbb3acf5e3356e0bb88c38815790b (diff)
downloadlinux-c53ed3e99920df6a90553c89a1c053aa0776841e.tar.gz
linux-c53ed3e99920df6a90553c89a1c053aa0776841e.zip
Merge drm/drm-next into drm-xe-next
Bringing in recent display changes. Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Diffstat (limited to 'lib/debugobjects.c')
-rw-r--r--lib/debugobjects.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/debugobjects.c b/lib/debugobjects.c
index 12f50de85b62..12e2e42e6a31 100644
--- a/lib/debugobjects.c
+++ b/lib/debugobjects.c
@@ -1024,7 +1024,7 @@ void debug_object_assert_init(void *addr, const struct debug_obj_descr *descr)
raw_spin_lock_irqsave(&db->lock, flags);
obj = lookup_object_or_alloc(addr, db, descr, false, true);
raw_spin_unlock_irqrestore(&db->lock, flags);
- if (likely(!IS_ERR_OR_NULL(obj)))
+ if (!IS_ERR_OR_NULL(obj))
return;
/* If NULL the allocation has hit OOM */