commit 20d93fdb396e53e8f4fad2218acf4320e954a235
author Linux Build Service Account <lnxbuild@quicinc.com> Thu Sep 21 20:12:43 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Sep 21 20:12:43 2017 -0700
tree 8e74b83d3bad2230e487bfe0a638dbf84223ff48
parent e397da0e75515574d00180d71b172f1132a0b98b
parent cd14ed98798da57cdbf65815d1d26d5441954edb

Merge "msm: vidc: Avoid printing session information due to ssr"

drivers/media/platform/msm/vidc/msm_vidc_common.c

diff --git a/drivers/media/platform/msm/vidc/msm_vidc_common.c b/drivers/media/platform/msm/vidc/msm_vidc_common.c
index 4238eda..f77443b 100644
--- a/drivers/media/platform/msm/vidc/msm_vidc_common.c
+++ b/drivers/media/platform/msm/vidc/msm_vidc_common.c
@@ -2196,7 +2196,8 @@
 			"%s: Send sys error for inst %pK\n", __func__, inst);
 		change_inst_state(inst, MSM_VIDC_CORE_INVALID);
 		msm_vidc_queue_v4l2_event(inst, V4L2_EVENT_MSM_VIDC_SYS_ERROR);
-		msm_comm_print_inst_info(inst);
+		if (!core->trigger_ssr)
+			msm_comm_print_inst_info(inst);
 	}
 	dprintk(VIDC_DBG, "Calling core_release\n");
 	rc = call_hfi_op(hdev, core_release, hdev->hfi_device_data);