Skip to content

Commit 1fa88d5

Browse files
committed
FIXUP: "fbdev: Allow client to request a particular /dev/fbdevN node"
Fixes up forward port to 6.16 Squash in (currently) ee76d85. Signed-off-by: Dave Stevenson <[email protected]>
1 parent e697a3b commit 1fa88d5

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/video/fbdev/core/fbmem.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,12 +446,12 @@ static int do_register_framebuffer(struct fb_info *fb_info)
446446
if (num_registered_fb == FB_MAX)
447447
return -ENXIO;
448448

449-
i = fb_info->node;
450449
if (!fb_info->custom_fb_num || fb_info->node >= FB_MAX || registered_fb[fb_info->node]) {
451450
for (i = min_dynamic_fb ; i < FB_MAX; i++)
452451
if (!registered_fb[i])
453452
break;
454453
}
454+
455455
if (!fb_info->modelist.prev || !fb_info->modelist.next)
456456
INIT_LIST_HEAD(&fb_info->modelist);
457457

@@ -460,7 +460,6 @@ static int do_register_framebuffer(struct fb_info *fb_info)
460460
if (err < 0)
461461
return err;
462462

463-
fb_info->node = i;
464463
refcount_set(&fb_info->count, 1);
465464
mutex_init(&fb_info->lock);
466465
mutex_init(&fb_info->mm_lock);

0 commit comments

Comments
 (0)