diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-11 22:33:03 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-11 22:33:03 -0700 |
| commit | f5724ba17bd5c59cf660a6474c3fedc16c4715fd (patch) | |
| tree | d76e1c735f5635be9801c912cd8993cd290331b2 | |
| parent | 7cbea6b0cc26ec4d424d5ce669a705a9d57306f1 (diff) | |
| parent | 5a9807e1338684fbba7468074bb1c737d626418f (diff) | |
Merge "msm: vidc: Fix the condition to check dcvs support"
| -rw-r--r-- | drivers/media/platform/msm/vidc/msm_vidc_dcvs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/platform/msm/vidc/msm_vidc_dcvs.c b/drivers/media/platform/msm/vidc/msm_vidc_dcvs.c index 0e62811bf41b..3cd1c38f8f37 100644 --- a/drivers/media/platform/msm/vidc/msm_vidc_dcvs.c +++ b/drivers/media/platform/msm/vidc/msm_vidc_dcvs.c @@ -599,8 +599,8 @@ static bool msm_dcvs_check_supported(struct msm_vidc_inst *inst) goto dcvs_decision_done; } if (msm_comm_turbo_session(inst) || - !IS_VALID_DCVS_SESSION(instance_load, dcvs_limit || - instance_count > 1)) + !IS_VALID_DCVS_SESSION(instance_load, dcvs_limit) || + instance_count > 1) is_dcvs_supported = false; } if (inst->session_type == MSM_VIDC_ENCODER) { @@ -617,8 +617,8 @@ static bool msm_dcvs_check_supported(struct msm_vidc_inst *inst) goto dcvs_decision_done; } if (msm_comm_turbo_session(inst) || - !IS_VALID_DCVS_SESSION(instance_load, dcvs_limit || - instance_count > 1)) + !IS_VALID_DCVS_SESSION(instance_load, dcvs_limit) || + instance_count > 1) is_dcvs_supported = false; } dcvs_decision_done: |