aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-10-25 04:14:25 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2018-10-25 04:14:28 -0700
commit8a7b1befa6f2e960f44e19cef2cccf91efe35dac (patch)
tree15aeb01546dbe14a9977582d5e1908edeae5686f
parentbc48684eb5a786e35422981439720e66d5508dee (diff)
parent277851b4417039272df4119214be5ce38e6ac4e4 (diff)
Merge "msm: vidc: ignore processing responses in invalid state" into kernel.lnx.4.9.r18-relLA.UM.6.8.r3-02500-SDM710.0LA.UM.6.8.r3-02400-SDM710.0
-rw-r--r--drivers/media/platform/msm/vidc_3x/venus_hfi.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/platform/msm/vidc_3x/venus_hfi.c b/drivers/media/platform/msm/vidc_3x/venus_hfi.c
index ec6f9b0b491e..4a5295322251 100644
--- a/drivers/media/platform/msm/vidc_3x/venus_hfi.c
+++ b/drivers/media/platform/msm/vidc_3x/venus_hfi.c
@@ -3644,6 +3644,12 @@ err_no_work:
i < num_responses; ++i) {
struct msm_vidc_cb_info *r = &device->response_pkt[i];
+ 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);
}