Merge "msm: camera: flash: Make warning non fatal for early PCR" into camera-kernel.lnx.5.0

drivers/cam_sensor_module/cam_flash/cam_flash_core.c

@@ -757,7 +757,6 @@ int cam_flash_pmic_apply_setting(struct cam_flash_ctrl *fctrl,
 					CAM_WARN(CAM_FLASH,
 					"Wrong state :Prev state: %d",
 					fctrl->flash_state);
-					return -EINVAL;
 				}
 
 				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,
 					"Wrong state :Prev state: %d",
 					fctrl->flash_state);
-					return -EINVAL;
 				}
 
 				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;
 		}
 		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)) {
 				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,
 					"Apply setting failed: %d",
 					rc);
-
-			fctrl->flash_state = CAM_FLASH_STATE_CONFIG;
 			break;
 		}
 		default:

drivers/cam_sensor_module/cam_flash/cam_flash_dev.c

@@ -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_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) {
 			CAM_ERR(CAM_FLASH,
@@ -86,7 +87,8 @@ static int32_t cam_flash_driver_cmd(struct cam_flash_ctrl *fctrl,
 		break;
 	}
 	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) ||
 			(fctrl->flash_state == CAM_FLASH_STATE_START)) {
 			CAM_WARN(CAM_FLASH,
@@ -154,7 +156,8 @@ static int32_t cam_flash_driver_cmd(struct cam_flash_ctrl *fctrl,
 		break;
 	}
 	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) ||
 			(fctrl->flash_state == CAM_FLASH_STATE_START)) {
 			CAM_WARN(CAM_FLASH,
@@ -168,7 +171,8 @@ static int32_t cam_flash_driver_cmd(struct cam_flash_ctrl *fctrl,
 		break;
 	}
 	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) {
 			CAM_WARN(CAM_FLASH,
 				"Cannot apply Stop dev: Prev state is: %d",