media: venus: core: Fix mutex destroy in remove

The hfi_destroy function is called too early in remove method. It
destroys a mutex which is used later in the .remove from pmruntime.
Solve the issue by moving hfi_destroy after last usage of the mutex.

Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index f8b9a732bc65cc7e43190edc1120fb6bfef3be50..afd76bcd9978383b08823eac55170656138551d0 100644 (file)
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -318,7 +318,6 @@ static int venus_remove(struct platform_device *pdev)
        ret = hfi_core_deinit(core, true);
        WARN_ON(ret);
 
-       hfi_destroy(core);
        venus_shutdown(core);
        of_platform_depopulate(dev);
 
@@ -330,6 +329,8 @@ static int venus_remove(struct platform_device *pdev)
        if (pm_ops->core_put)
                pm_ops->core_put(dev);
 
+       hfi_destroy(core);
+
        icc_put(core->video_path);
        icc_put(core->cpucfg_path);