Skip to content

Commit 199bf39

Browse files
6by9pelwell
authored andcommitted
Fixup c91c9f2 ("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: c91c9f2 ("fbdev: Allow client to request a particular /dev/fbN node") Signed-off-by: Dave Stevenson <[email protected]>
1 parent dbdd5c3 commit 199bf39

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/video/fbdev/core/fbmem.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,7 @@ 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;
449450
if (!fb_info->custom_fb_num || fb_info->node >= FB_MAX || registered_fb[fb_info->node]) {
450451
for (i = min_dynamic_fb ; i < FB_MAX; i++)
451452
if (!registered_fb[i])
@@ -463,6 +464,7 @@ static int do_register_framebuffer(struct fb_info *fb_info)
463464
if (err < 0)
464465
return err;
465466

467+
fb_info->node = i;
466468
refcount_set(&fb_info->count, 1);
467469
mutex_init(&fb_info->lock);
468470
mutex_init(&fb_info->mm_lock);

0 commit comments

Comments
 (0)