From 9e5f95529bc3550872b833bf3e24a145f66999c6 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 1 Oct 2025 17:36:34 +0100 Subject: [PATCH] Fixup c91c9f257db9 ("fbdev: Allow client to request a particular /dev/fbN node") We lost a line in the forward port, which meant that it always used /dev/fb0, and complained that the sysfs nodes already existed. Fixes: c91c9f257db9 ("fbdev: Allow client to request a particular /dev/fbN node") Signed-off-by: Dave Stevenson --- drivers/video/fbdev/core/fbmem.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index 2dd3fc5d80ef..53a04850f7d7 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -446,6 +446,7 @@ 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]) @@ -463,6 +464,7 @@ 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);