Commit 476a841f authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

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: default avatarThomas Zimmermann <tzimmermann@suse.de>
Cc: Antonino Daplas <adaplas@gmail.com>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230613110953.24176-19-tzimmermann@suse.de
parent 8ad76089

drivers/video/fbdev/nvidia/nvidia.c

+4 −4
Original line number Diff line number Diff line
@@ -1400,14 +1400,14 @@ static int nvidiafb_probe(struct pci_dev *pd, const struct pci_device_id *ent) 


	pci_set_drvdata(pd, info);



	if (backlight)

		nvidia_bl_init(par);



	if (register_framebuffer(info) < 0) {

		printk(KERN_ERR PFX "error registering nVidia framebuffer\n");

		goto err_out_iounmap_fb;

	}



	if (backlight)

		nvidia_bl_init(par);



	printk(KERN_INFO PFX

	       "PCI nVidia %s framebuffer (%dMB @ 0x%lX)\n",

	       info->fix.id,
@@ -1439,9 +1439,9 @@ static void nvidiafb_remove(struct pci_dev *pd) 


	NVTRACE_ENTER();



	nvidia_bl_exit(par);

	unregister_framebuffer(info);



	nvidia_bl_exit(par);

	arch_phys_wc_del(par->wc_cookie);

	iounmap(info->screen_base);

	fb_destroy_modedb(info->monspecs.modedb);