Merge "msm: camera: isp: Fixing missing logging parameter" into camera-kernel.lnx.7.0
This commit is contained in:

committed by
Gerrit - the friendly Code Review server

commit
c88327f907
@@ -721,8 +721,8 @@ static int cam_ife_csid_ver1_deinit_rdi_path(
|
||||
if (res->res_state != CAM_ISP_RESOURCE_STATE_INIT_HW ||
|
||||
res->res_id > CAM_IFE_PIX_PATH_RES_RDI_4) {
|
||||
CAM_ERR(CAM_ISP,
|
||||
"CSID:%d %s path res type:%d res_id:%d Invalid state%d",
|
||||
csid_hw->hw_intf->hw_idx,
|
||||
"CSID:%d %s path res_type:%d res_id:%d Invalid state:%d",
|
||||
csid_hw->hw_intf->hw_idx, res->res_name,
|
||||
res->res_type, res->res_id, res->res_state);
|
||||
return -EINVAL;
|
||||
}
|
||||
@@ -781,8 +781,8 @@ static int cam_ife_csid_ver1_deinit_udi_path(
|
||||
(res->res_id < CAM_IFE_PIX_PATH_RES_UDI_0 ||
|
||||
res->res_id > CAM_IFE_PIX_PATH_RES_UDI_2)) {
|
||||
CAM_ERR(CAM_ISP,
|
||||
"CSID:%d %s path res type:%d res_id:%d Invalid state%d",
|
||||
csid_hw->hw_intf->hw_idx,
|
||||
"CSID:%d %s path res_type:%d res_id:%d Invalid state:%d",
|
||||
csid_hw->hw_intf->hw_idx, res->res_name,
|
||||
res->res_type, res->res_id, res->res_state);
|
||||
return -EINVAL;
|
||||
}
|
||||
@@ -839,8 +839,8 @@ static int cam_ife_csid_ver1_deinit_pxl_path(
|
||||
|
||||
if (res->res_state != CAM_ISP_RESOURCE_STATE_INIT_HW) {
|
||||
CAM_ERR(CAM_ISP,
|
||||
"CSID:%d %s path res type:%d res_id:%d Invalid state%d",
|
||||
csid_hw->hw_intf->hw_idx,
|
||||
"CSID:%d %s path res_type:%d res_id:%d Invalid state:%d",
|
||||
csid_hw->hw_intf->hw_idx, res->res_name,
|
||||
res->res_type, res->res_id, res->res_state);
|
||||
return -EINVAL;
|
||||
}
|
||||
@@ -900,8 +900,8 @@ static int cam_ife_csid_ver1_stop_pxl_path(
|
||||
|
||||
if (res->res_state != CAM_ISP_RESOURCE_STATE_STREAMING) {
|
||||
CAM_ERR(CAM_ISP,
|
||||
"CSID:%d %s path res type:%d res_id:%d Invalid state%d",
|
||||
csid_hw->hw_intf->hw_idx,
|
||||
"CSID:%d %s path res_type:%d res_id:%d Invalid state:%d",
|
||||
csid_hw->hw_intf->hw_idx, res->res_name,
|
||||
res->res_type, res->res_id, res->res_state);
|
||||
return -EINVAL;
|
||||
}
|
||||
@@ -983,8 +983,8 @@ static int cam_ife_csid_ver1_stop_rdi_path(
|
||||
|
||||
if (res->res_state != CAM_ISP_RESOURCE_STATE_STREAMING) {
|
||||
CAM_ERR(CAM_ISP,
|
||||
"CSID:%d %s path res type:%d res_id:%d Invalid state%d",
|
||||
csid_hw->hw_intf->hw_idx,
|
||||
"CSID:%d %s path res_type:%d res_id:%d Invalid state:%d",
|
||||
csid_hw->hw_intf->hw_idx, res->res_name,
|
||||
res->res_type, res->res_id, res->res_state);
|
||||
return -EINVAL;
|
||||
}
|
||||
@@ -1040,8 +1040,8 @@ static int cam_ife_csid_ver1_stop_udi_path(
|
||||
|
||||
if (res->res_state != CAM_ISP_RESOURCE_STATE_STREAMING) {
|
||||
CAM_ERR(CAM_ISP,
|
||||
"CSID:%d %s path res type:%d res_id:%d Invalid state%d",
|
||||
csid_hw->hw_intf->hw_idx,
|
||||
"CSID:%d %s path res_type:%d res_id:%d Invalid state:%d",
|
||||
csid_hw->hw_intf->hw_idx, res->res_name,
|
||||
res->res_type, res->res_id, res->res_state);
|
||||
return -EINVAL;
|
||||
}
|
||||
@@ -1863,8 +1863,8 @@ static int cam_ife_csid_ver1_start_rdi_path(
|
||||
if (res->res_state != CAM_ISP_RESOURCE_STATE_INIT_HW ||
|
||||
res->res_id > CAM_IFE_PIX_PATH_RES_RDI_4) {
|
||||
CAM_ERR(CAM_ISP,
|
||||
"CSID:%d %s path res type:%d res_id:%d Invalid state%d",
|
||||
csid_hw->hw_intf->hw_idx,
|
||||
"CSID:%d %s path res_type:%d res_id:%d Invalid state:%d",
|
||||
csid_hw->hw_intf->hw_idx, res->res_name,
|
||||
res->res_type, res->res_id, res->res_state);
|
||||
return -EINVAL;
|
||||
}
|
||||
@@ -1914,8 +1914,8 @@ static int cam_ife_csid_ver1_start_udi_path(
|
||||
(res->res_id < CAM_IFE_PIX_PATH_RES_UDI_0 ||
|
||||
res->res_id > CAM_IFE_PIX_PATH_RES_UDI_2)) {
|
||||
CAM_ERR(CAM_ISP,
|
||||
"CSID:%d %s path res type:%d res_id:%d Invalid state%d",
|
||||
csid_hw->hw_intf->hw_idx,
|
||||
"CSID:%d %s path res_type:%d res_id:%d Invalid state:%d",
|
||||
csid_hw->hw_intf->hw_idx, res->res_name,
|
||||
res->res_type, res->res_id, res->res_state);
|
||||
return -EINVAL;
|
||||
}
|
||||
@@ -1966,8 +1966,8 @@ static int cam_ife_csid_ver1_start_pix_path(
|
||||
|
||||
if (res->res_state != CAM_ISP_RESOURCE_STATE_INIT_HW) {
|
||||
CAM_ERR(CAM_ISP,
|
||||
"CSID:%d %s path res type:%d res_id:%d Invalid state%d",
|
||||
csid_hw->hw_intf->hw_idx,
|
||||
"CSID:%d %s path res_type:%d res_id:%d Invalid state:%d",
|
||||
csid_hw->hw_intf->hw_idx, res->res_name,
|
||||
res->res_type, res->res_id, res->res_state);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
Reference in New Issue
Block a user