Prechádzať zdrojové kódy

msm: camera: isp: Set error type to fatal

This change sets error type to fatal by default when hardware
errors occur.

CRs-Fixed: 2545140
Change-Id: Ic530fe460e67b6d5ec26a6d9d5735f4c8b34affc
Signed-off-by: Venkat Chinta <[email protected]>
Venkat Chinta 5 rokov pred
rodič
commit
11e7f21754
1 zmenil súbory, kde vykonal 3 pridanie a 5 odobranie
  1. 3 5
      drivers/cam_isp/cam_isp_context.c

+ 3 - 5
drivers/cam_isp/cam_isp_context.c

@@ -1405,7 +1405,7 @@ move_to_pending:
 end:
 end:
 	do {
 	do {
 		if (list_empty(&ctx->pending_req_list)) {
 		if (list_empty(&ctx->pending_req_list)) {
-			error_request_id = ctx_isp->last_applied_req_id + 1;
+			error_request_id = ctx_isp->last_applied_req_id;
 			req_isp = NULL;
 			req_isp = NULL;
 			break;
 			break;
 		}
 		}
@@ -1436,13 +1436,11 @@ end:
 		notify.link_hdl = ctx->link_hdl;
 		notify.link_hdl = ctx->link_hdl;
 		notify.dev_hdl = ctx->dev_hdl;
 		notify.dev_hdl = ctx->dev_hdl;
 		notify.req_id = error_request_id;
 		notify.req_id = error_request_id;
+		notify.error = CRM_KMD_ERR_FATAL;
 
 
-		if (req_isp_to_report && req_isp_to_report->bubble_report) {
+		if (req_isp_to_report && req_isp_to_report->bubble_report)
 			if (error_event_data->recovery_enabled)
 			if (error_event_data->recovery_enabled)
 				notify.error = CRM_KMD_ERR_BUBBLE;
 				notify.error = CRM_KMD_ERR_BUBBLE;
-		} else {
-			notify.error = CRM_KMD_ERR_FATAL;
-		}
 
 
 		CAM_WARN(CAM_ISP,
 		CAM_WARN(CAM_ISP,
 			"Notify CRM: req %lld, frame %lld ctx %u, error %d",
 			"Notify CRM: req %lld, frame %lld ctx %u, error %d",