From 49e50b82c289fe4f72e495965c39d0b1cd14f9c1 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 11 Jun 2025 17:28:11 +0100 Subject: [PATCH] FIXUP: "fbdev: Allow client to request a particular /dev/fbdevN node" Fixes up forward port to 6.16 Squash in (currently) ee76d8549ca02d29a5add4f2596659a61b89a2bc. Signed-off-by: Dave Stevenson --- drivers/video/fbdev/core/fbmem.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index f1eefa5da9629..299af34183fda 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -446,12 +446,12 @@ static int do_register_framebuffer(struct fb_info *fb_info) if (num_registered_fb == FB_MAX) return -ENXIO; - i = fb_info->node; if (!fb_info->custom_fb_num || fb_info->node >= FB_MAX || registered_fb[fb_info->node]) { for (i = min_dynamic_fb ; i < FB_MAX; i++) if (!registered_fb[i]) break; } + if (!fb_info->modelist.prev || !fb_info->modelist.next) INIT_LIST_HEAD(&fb_info->modelist); @@ -460,7 +460,6 @@ static int do_register_framebuffer(struct fb_info *fb_info) if (err < 0) return err; - fb_info->node = i; refcount_set(&fb_info->count, 1); mutex_init(&fb_info->lock); mutex_init(&fb_info->mm_lock);