MALI: rockchip: upgrade utgard DDK to r6p0-01rel1

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / arm / mali400 / mali / common / mali_timeline.c

diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline.c b/drivers/gpu/arm/mali400/mali/common/mali_timeline.c
index 5a767b39d56e0283fb6e6fd6733cbc0a7eccdaa5..dccc303480026118a74e0f2ecc860f6211175574 100755 (executable)
--- a/drivers/gpu/arm/mali400/mali/common/mali_timeline.c
+++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline.c
@@ -237,17 +237,17 @@ static void mali_timeline_destroy(struct mali_timeline *timeline)
                MALI_DEBUG_ASSERT(NULL != timeline->system);
                MALI_DEBUG_ASSERT(MALI_TIMELINE_MAX > timeline->id);
 
+               if (NULL != timeline->delayed_work) {
+                       _mali_osk_wq_delayed_cancel_work_sync(timeline->delayed_work);
+                       _mali_osk_wq_delayed_delete_work_nonflush(timeline->delayed_work);
+               }
+
 #if defined(CONFIG_SYNC)
                if (NULL != timeline->sync_tl) {
                        sync_timeline_destroy(timeline->sync_tl);
                }
 #endif /* defined(CONFIG_SYNC) */
 
-               if (NULL != timeline->delayed_work) {
-                       _mali_osk_wq_delayed_cancel_work_sync(timeline->delayed_work);
-                       _mali_osk_wq_delayed_delete_work_nonflush(timeline->delayed_work);
-               }
-
 #ifndef CONFIG_SYNC
                _mali_osk_free(timeline);
 #endif