aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrishansh Bhardwaj <tbhardwa@codeaurora.org>2018-12-12 15:36:21 +0530
committerSandeep Kunta <skunta@codeaurora.org>2018-12-12 21:45:00 +0530
commitda49d4ffbe878fc39e1821761f7eb0e3d5664b45 (patch)
tree52a2b9e2813f322571e3346cd39dc0b75b5e235c
parent3ce2daddd72430e9780955ef0e6a6789047de5f9 (diff)
msm: camera: flash: Remove race condition in subdev closeLA.UM.7.3.r1-06600-sdm845.0
Subdev close is calling flash_shutdown() to flush req and release device operation. flash_subdev_close() does the mutex lock already. Removing same mutex lock opertion from flash_shutdown() function to remove race condition. Change-Id: Ib5fcb6f683b8c997121b3f4fb301eb34b76c2c1b Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
-rw-r--r--drivers/media/platform/msm/camera/cam_sensor_module/cam_flash/cam_flash_core.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/platform/msm/camera/cam_sensor_module/cam_flash/cam_flash_core.c b/drivers/media/platform/msm/camera/cam_sensor_module/cam_flash/cam_flash_core.c
index ff385ca06528..8c075f576ce6 100644
--- a/drivers/media/platform/msm/camera/cam_sensor_module/cam_flash/cam_flash_core.c
+++ b/drivers/media/platform/msm/camera/cam_sensor_module/cam_flash/cam_flash_core.c
@@ -1565,9 +1565,7 @@ void cam_flash_shutdown(struct cam_flash_ctrl *fctrl)
if ((fctrl->flash_state == CAM_FLASH_STATE_CONFIG) ||
(fctrl->flash_state == CAM_FLASH_STATE_START)) {
- mutex_lock(&(fctrl->flash_mutex));
fctrl->func_tbl.flush_req(fctrl, FLUSH_ALL, 0);
- mutex_unlock(&(fctrl->flash_mutex));
rc = fctrl->func_tbl.power_ops(fctrl, false);
if (rc)
CAM_ERR(CAM_FLASH, "Power Down Failed rc: %d",