fbdev: uvesafb: Call cn_del_callback() at the end of uvesafb_exit()

[ Upstream commit 1022e7e2f40574c74ed32c3811b03d26b0b81daf ]

Delete the v86d netlink only after all the VBE tasks have been
completed.

Fixes initial state restore on module unload:
uvesafb: VBE state restore call failed (eax=0x4f04, err=-19)

Signed-off-by: Jorge Maidana <jorgem.linux@gmail.com>
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
index ee86c62e3672874e3de764dbfc948eef536e1ce8..72255715bbee0c8d7b8ad2ccb9bc904d6052fff7 100644 (file)
--- a/drivers/video/fbdev/uvesafb.c
+++ b/drivers/video/fbdev/uvesafb.c
@@ -1931,10 +1931,10 @@ static void uvesafb_exit(void)
                }
        }
 
-       cn_del_callback(&uvesafb_cn_id);
        driver_remove_file(&uvesafb_driver.driver, &driver_attr_v86d);
        platform_device_unregister(uvesafb_device);
        platform_driver_unregister(&uvesafb_driver);
+       cn_del_callback(&uvesafb_cn_id);
 }
 
 module_exit(uvesafb_exit);