2 files changed, 4 insertions, 1 deletions

diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 9a08445a7a7a..01d936b7be43 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -369,7 +369,7 @@ mode_fixup(struct drm_atomic_state *state)
         struct drm_connector *connector;
         struct drm_connector_state *conn_state;
         int i;
-        bool ret;
+        int ret;
 
         for_each_crtc_in_state(state, crtc, crtc_state, i) {
                 if (!crtc_state->mode_changed &&
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index a30c645035de..f6d4d9700734 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -860,6 +860,9 @@ void drm_fb_helper_fini(struct drm_fb_helper *fb_helper)
         if (!drm_fbdev_emulation)
                 return;
 
+        cancel_work_sync(&fb_helper->resume_work);
+        cancel_work_sync(&fb_helper->dirty_work);
+
         mutex_lock(&kernel_fb_helper_lock);
         if (!list_empty(&fb_helper->kernel_fb_list)) {
                 list_del(&fb_helper->kernel_fb_list);