Commit 85362a7b authored by Thomas Zimmermann's avatar Thomas Zimmermann

fbdev/aty128fb: 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>
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-10-tzimmermann@suse.de
parent dab320de
...@@ -2028,14 +2028,14 @@ static int aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -2028,14 +2028,14 @@ static int aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent)
par->asleep = 0; par->asleep = 0;
par->lock_blank = 0; par->lock_blank = 0;
if (register_framebuffer(info) < 0)
return 0;
#ifdef CONFIG_FB_ATY128_BACKLIGHT #ifdef CONFIG_FB_ATY128_BACKLIGHT
if (backlight) if (backlight)
aty128_bl_init(par); aty128_bl_init(par);
#endif #endif
if (register_framebuffer(info) < 0)
return 0;
fb_info(info, "%s frame buffer device on %s\n", fb_info(info, "%s frame buffer device on %s\n",
info->fix.id, video_card); info->fix.id, video_card);
...@@ -2167,12 +2167,12 @@ static void aty128_remove(struct pci_dev *pdev) ...@@ -2167,12 +2167,12 @@ static void aty128_remove(struct pci_dev *pdev)
par = info->par; par = info->par;
unregister_framebuffer(info);
#ifdef CONFIG_FB_ATY128_BACKLIGHT #ifdef CONFIG_FB_ATY128_BACKLIGHT
aty128_bl_exit(info->bl_dev); aty128_bl_exit(info->bl_dev);
#endif #endif
unregister_framebuffer(info);
arch_phys_wc_del(par->wc_cookie); arch_phys_wc_del(par->wc_cookie);
iounmap(par->regbase); iounmap(par->regbase);
iounmap(info->screen_base); iounmap(info->screen_base);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment