Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fbdev/nvidiafb: Reorder backlight and framebuffer init/cleanup

The driver's backlight code requires the framebuffer to be
registered. Therefore reorder the init and cleanup calls for
both data structures.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Antonino Daplas <adaplas@gmail.com>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230613110953.24176-19-tzimmermann@suse.de

+4 -4
+4 -4
drivers/video/fbdev/nvidia/nvidia.c
··· 1400 1400 1401 1401 pci_set_drvdata(pd, info); 1402 1402 1403 - if (backlight) 1404 - nvidia_bl_init(par); 1405 - 1406 1403 if (register_framebuffer(info) < 0) { 1407 1404 printk(KERN_ERR PFX "error registering nVidia framebuffer\n"); 1408 1405 goto err_out_iounmap_fb; 1409 1406 } 1407 + 1408 + if (backlight) 1409 + nvidia_bl_init(par); 1410 1410 1411 1411 printk(KERN_INFO PFX 1412 1412 "PCI nVidia %s framebuffer (%dMB @ 0x%lX)\n", ··· 1439 1439 1440 1440 NVTRACE_ENTER(); 1441 1441 1442 + nvidia_bl_exit(par); 1442 1443 unregister_framebuffer(info); 1443 1444 1444 - nvidia_bl_exit(par); 1445 1445 arch_phys_wc_del(par->wc_cookie); 1446 1446 iounmap(info->screen_base); 1447 1447 fb_destroy_modedb(info->monspecs.modedb);