Merge tag 'fallthrough-fixes-clang-5.11-rc1' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-microblaze.git] / drivers / remoteproc / qcom_q6v5_pas.c

diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c
index b4bfbf2..ee58622 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_pas.c
+++ b/drivers/remoteproc/qcom_q6v5_pas.c
@@ -99,8 +99,11 @@ static int adsp_pds_enable(struct qcom_adsp *adsp, struct device **pds,
        for (i = 0; i < pd_count; i++) {
                dev_pm_genpd_set_performance_state(pds[i], INT_MAX);
                ret = pm_runtime_get_sync(pds[i]);
-               if (ret < 0)
+               if (ret < 0) {
+                       pm_runtime_put_noidle(pds[i]);
+                       dev_pm_genpd_set_performance_state(pds[i], 0);
                        goto unroll_pd_votes;
+               }
        }
 
        return 0;
@@ -630,6 +633,7 @@ static const struct adsp_data mpss_resource_init = {
        .crash_reason_smem = 421,
        .firmware_name = "modem.mdt",
        .pas_id = 4,
+       .minidump_id = 3,
        .has_aggre2_clk = false,
        .auto_boot = false,
        .active_pd_names = (char*[]){