aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-10-24 05:58:14 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2018-10-24 05:58:14 -0700
commit13812fc52c76c42ee08da655648c17e4e031290f (patch)
tree91cc4ad1d3a3b44ddfbfbd3c50fda2110dffe62e
parent6f47aa10451f62cab134298ea748e8285ac1aed9 (diff)
parent375eba337f61909d972c08f702e9cd4455f83519 (diff)
Merge "msm: vidc: ignore processing responses in invalid state" into kernel.lnx.4.9.r26-relLA.UM.7.8.r2-00500-QCS605.0
-rw-r--r--drivers/media/platform/msm/vidc/venus_hfi.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/platform/msm/vidc/venus_hfi.c b/drivers/media/platform/msm/vidc/venus_hfi.c
index 2acd0d5c94ec..7c01a185d2cd 100644
--- a/drivers/media/platform/msm/vidc/venus_hfi.c
+++ b/drivers/media/platform/msm/vidc/venus_hfi.c
@@ -3229,6 +3229,12 @@ err_no_work:
struct msm_vidc_cb_info *r = &device->response_pkt[i];
dprintk(VIDC_DBG, "Processing response %d of %d, type %d\n",
(i + 1), num_responses, r->response_type);
+ if (!__core_in_valid_state(device)) {
+ dprintk(VIDC_ERR,
+ "Ignore responses from %d to %d as device is in invalid state",
+ (i + 1), num_responses);
+ break;
+ }
device->callback(r->response_type, &r->response);
}