Merge "msm: camera: flash: Correct log location" into camera-kernel.lnx.5.0
This commit is contained in:

committed by
Gerrit - the friendly Code Review server

commit
4109d556c1
@@ -35,9 +35,6 @@ 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_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,
|
||||||
"Cannot apply Acquire dev: Prev state: %d",
|
"Cannot apply Acquire dev: Prev state: %d",
|
||||||
@@ -84,6 +81,9 @@ static int32_t cam_flash_driver_cmd(struct cam_flash_ctrl *fctrl,
|
|||||||
goto release_mutex;
|
goto release_mutex;
|
||||||
}
|
}
|
||||||
fctrl->flash_state = CAM_FLASH_STATE_ACQUIRE;
|
fctrl->flash_state = CAM_FLASH_STATE_ACQUIRE;
|
||||||
|
|
||||||
|
CAM_INFO(CAM_FLASH, "CAM_ACQUIRE_DEV for dev_hdl: 0x%x",
|
||||||
|
fctrl->bridge_intf.device_hdl);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case CAM_RELEASE_DEV: {
|
case CAM_RELEASE_DEV: {
|
||||||
|
Reference in New Issue
Block a user