diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2023-06-13 13:06:53 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2023-06-27 09:58:49 +0200 |
| commit | 476a841f35ac47adac2f4c699f3176de86b170b3 (patch) | |
| tree | 0bd42a0196146c0ae2311b25404e84bcfda7f2b6 /drivers/video/fbdev/nvidia | |
| parent | 8ad760892f6c85045397e726c42f0ffd4da7545f (diff) | |
| download | linux-stable-476a841f35ac47adac2f4c699f3176de86b170b3.tar.gz linux-stable-476a841f35ac47adac2f4c699f3176de86b170b3.tar.bz2 linux-stable-476a841f35ac47adac2f4c699f3176de86b170b3.zip | |
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
Diffstat (limited to 'drivers/video/fbdev/nvidia')
| -rw-r--r-- | drivers/video/fbdev/nvidia/nvidia.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c index ea4ba3dfb96b..039e886346fa 100644 --- a/drivers/video/fbdev/nvidia/nvidia.c +++ b/drivers/video/fbdev/nvidia/nvidia.c @@ -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); |