samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msm: camera: flash: Make warning non fatal for early PCR

Browse Source 
Currently early init pcr with torch mode is returning fatal error
with warning message. The operation still can be perform from the
flash hw prospective. This change removes the code break with
warning message and perform the on/off operation. Also, convert
streamon/streamoff specific ioctl call from debug to info log
for better operation trace.

CRs-Fixed: 2939386
Change-Id: Ib0b049231e9fba3956668a0aaca92b58599e358f
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
This commit is contained in:
Jigarkumar Zala
2021-08-10 13:07:59 -07:00
committed by Gerrit - the friendly Code Review server
parent 46d07dd8d8
commit 159e8902b5
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/cam_sensor_module/cam_flash/cam_flash_core.c
View File

@@ -757,7 +757,6 @@ int cam_flash_pmic_apply_setting(struct cam_flash_ctrl *fctrl,
CAM_WARN(CAM_FLASH, CAM_WARN(CAM_FLASH,
"Wrong state :Prev state: %d", "Wrong state :Prev state: %d",
fctrl->flash_state); fctrl->flash_state);
return -EINVAL;
} }
rc = cam_flash_high(fctrl, flash_data); rc = cam_flash_high(fctrl, flash_data);
@@ -772,7 +771,6 @@ int cam_flash_pmic_apply_setting(struct cam_flash_ctrl *fctrl,
CAM_WARN(CAM_FLASH, CAM_WARN(CAM_FLASH,
"Wrong state :Prev state: %d", "Wrong state :Prev state: %d",
fctrl->flash_state); fctrl->flash_state);
return -EINVAL;
} }
rc = cam_flash_low(fctrl, flash_data); rc = cam_flash_low(fctrl, flash_data);
@@ -1411,7 +1409,8 @@ int cam_flash_pmic_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg)
break; break;
} }
case CAMERA_SENSOR_FLASH_CMD_TYPE_INIT_FIRE: { case CAMERA_SENSOR_FLASH_CMD_TYPE_INIT_FIRE: {
CAM_DBG(CAM_FLASH, "INIT_FIRE Operation"); CAM_INFO(CAM_FLASH, "INIT_FIRE Operation for dev_hdl: 0x%x",
fctrl->bridge_intf.device_hdl);
if (remain_len < sizeof(struct cam_flash_set_on_off)) { if (remain_len < sizeof(struct cam_flash_set_on_off)) {
CAM_ERR(CAM_FLASH, "Not enough buffer"); CAM_ERR(CAM_FLASH, "Not enough buffer");
@@ -1450,8 +1449,6 @@ int cam_flash_pmic_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg)
CAM_ERR(CAM_FLASH, CAM_ERR(CAM_FLASH,
"Apply setting failed: %d", "Apply setting failed: %d",
rc); rc);
fctrl->flash_state = CAM_FLASH_STATE_CONFIG;
break; break;
} }
default: default:

12
drivers/cam_sensor_module/cam_flash/cam_flash_dev.c
View File

@@ -35,7 +35,8 @@ static int32_t cam_flash_driver_cmd(struct cam_flash_ctrl *fctrl,
struct cam_sensor_acquire_dev flash_acq_dev; struct cam_sensor_acquire_dev flash_acq_dev;
struct cam_create_dev_hdl bridge_params; struct cam_create_dev_hdl bridge_params;
CAM_DBG(CAM_FLASH, "CAM_ACQUIRE_DEV"); CAM_INFO(CAM_FLASH, "CAM_ACQUIRE_DEV for dev_hdl: 0x%x",
fctrl->bridge_intf.device_hdl);
if (fctrl->flash_state != CAM_FLASH_STATE_INIT) { if (fctrl->flash_state != CAM_FLASH_STATE_INIT) {
CAM_ERR(CAM_FLASH, CAM_ERR(CAM_FLASH,
@@ -86,7 +87,8 @@ static int32_t cam_flash_driver_cmd(struct cam_flash_ctrl *fctrl,
break; break;
} }
case CAM_RELEASE_DEV: { case CAM_RELEASE_DEV: {
CAM_DBG(CAM_FLASH, "CAM_RELEASE_DEV"); CAM_INFO(CAM_FLASH, "CAM_RELEASE_DEV for dev_hdl: 0x%x",
fctrl->bridge_intf.device_hdl);
if ((fctrl->flash_state == CAM_FLASH_STATE_INIT) || if ((fctrl->flash_state == CAM_FLASH_STATE_INIT) ||
(fctrl->flash_state == CAM_FLASH_STATE_START)) { (fctrl->flash_state == CAM_FLASH_STATE_START)) {
CAM_WARN(CAM_FLASH, CAM_WARN(CAM_FLASH,
@@ -154,7 +156,8 @@ static int32_t cam_flash_driver_cmd(struct cam_flash_ctrl *fctrl,
break; break;
} }
case CAM_START_DEV: { case CAM_START_DEV: {
CAM_DBG(CAM_FLASH, "CAM_START_DEV"); CAM_INFO(CAM_FLASH, "CAM_START_DEV for dev_hdl: 0x%x",
fctrl->bridge_intf.device_hdl);
if ((fctrl->flash_state == CAM_FLASH_STATE_INIT) || if ((fctrl->flash_state == CAM_FLASH_STATE_INIT) ||
(fctrl->flash_state == CAM_FLASH_STATE_START)) { (fctrl->flash_state == CAM_FLASH_STATE_START)) {
CAM_WARN(CAM_FLASH, CAM_WARN(CAM_FLASH,
@@ -168,7 +171,8 @@ static int32_t cam_flash_driver_cmd(struct cam_flash_ctrl *fctrl,
break; break;
} }
case CAM_STOP_DEV: { case CAM_STOP_DEV: {
CAM_DBG(CAM_FLASH, "CAM_STOP_DEV ENTER"); CAM_INFO(CAM_FLASH, "CAM_STOP_DEV ENTER for dev_hdl: 0x%x",
fctrl->bridge_intf.device_hdl);
if (fctrl->flash_state != CAM_FLASH_STATE_START) { if (fctrl->flash_state != CAM_FLASH_STATE_START) {
CAM_WARN(CAM_FLASH, CAM_WARN(CAM_FLASH,
"Cannot apply Stop dev: Prev state is: %d", "Cannot apply Stop dev: Prev state is: %d",