summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwenchangliu <wenchangliu@google.com>2024-02-05 11:12:36 +0000
committerTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-02-06 16:10:55 +0000
commit6a4f8afe8a6cba336fb29df9841be2c0085958b8 (patch)
tree560f17be06b727085b7d0af0c4d8a793001497ea
parentdbfb09926aa5bb9c4093aa86ae77428d727cd250 (diff)
downloadgs-6a4f8afe8a6cba336fb29df9841be2c0085958b8.tar.gz
media: mfc: use del_timer_sync() for mfc_idle_timer
mfc_idle_timer may still be triggered by mod_timer() after del_timer() is called from core deinit. To avoid this, use del_timer_sync() instead of del_timer() to delete the mfc_idle_timer during core deinit. This will ensure that the MFC idle suspend is not triggered after mfc_release(). Bug: 323783954 Test: pause/resume/close all mfc components Change-Id: I3b79b5bc0409868cb6cf61ab902068a518211990 Signed-off-by: wenchangliu <wenchangliu@google.com>
-rw-r--r--drivers/media/platform/exynos/mfc/mfc_core_ops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/exynos/mfc/mfc_core_ops.c b/drivers/media/platform/exynos/mfc/mfc_core_ops.c
index 04f96f7b8..0a1741803 100644
--- a/drivers/media/platform/exynos/mfc/mfc_core_ops.c
+++ b/drivers/media/platform/exynos/mfc/mfc_core_ops.c
@@ -281,7 +281,7 @@ static int __mfc_core_deinit(struct mfc_core *core, struct mfc_ctx *ctx)
mfc_core_perf_boost_disable(core);
del_timer(&core->meerkat_timer);
- del_timer(&core->mfc_idle_timer);
+ del_timer_sync(&core->mfc_idle_timer);
flush_workqueue(core->butler_wq);