mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-09 21:59:12 -04:00
Revert "msm: camera: icp: lock before updating clock status"
This reverts commit 6094f6654bd6ddc7f6df54b19cb8e6697bf3111c. The change introduces a lock around a code that can cause sleep. It results in abnormal operation of camera functionality. Reverting this change will lead to original problem of stability. That need to be addressed. Change-Id: I3899d6992350bc466e89ee1ca1834a8a7fbd0269 Signed-off-by: Alok Pandey <akumarpa@codeaurora.org>
This commit is contained in:
parent
306cc41267
commit
82ee45360e
2 changed files with 0 additions and 10 deletions
|
|
@ -306,7 +306,6 @@ int cam_bps_process_cmd(void *device_priv, uint32_t cmd_type,
|
|||
struct cam_bps_device_core_info *core_info = NULL;
|
||||
struct cam_bps_device_hw_info *hw_info = NULL;
|
||||
int rc = 0;
|
||||
unsigned long flags;
|
||||
|
||||
if (!device_priv) {
|
||||
CAM_ERR(CAM_ICP, "Invalid arguments");
|
||||
|
|
@ -396,16 +395,12 @@ int cam_bps_process_cmd(void *device_priv, uint32_t cmd_type,
|
|||
}
|
||||
break;
|
||||
case CAM_ICP_BPS_CMD_DISABLE_CLK:
|
||||
spin_lock_irqsave(&bps_dev->hw_lock, flags);
|
||||
if (core_info->clk_enable == true)
|
||||
cam_bps_toggle_clk(soc_info, false);
|
||||
core_info->clk_enable = false;
|
||||
spin_unlock_irqrestore(&bps_dev->hw_lock, flags);
|
||||
break;
|
||||
case CAM_ICP_BPS_CMD_RESET:
|
||||
spin_lock_irqsave(&bps_dev->hw_lock, flags);
|
||||
rc = cam_bps_cmd_reset(soc_info, core_info);
|
||||
spin_unlock_irqrestore(&bps_dev->hw_lock, flags);
|
||||
break;
|
||||
default:
|
||||
CAM_ERR(CAM_ICP, "Invalid Cmd Type:%u", cmd_type);
|
||||
|
|
|
|||
|
|
@ -305,7 +305,6 @@ int cam_ipe_process_cmd(void *device_priv, uint32_t cmd_type,
|
|||
struct cam_ipe_device_core_info *core_info = NULL;
|
||||
struct cam_ipe_device_hw_info *hw_info = NULL;
|
||||
int rc = 0;
|
||||
unsigned long flags;
|
||||
|
||||
if (!device_priv) {
|
||||
CAM_ERR(CAM_ICP, "Invalid arguments");
|
||||
|
|
@ -390,16 +389,12 @@ int cam_ipe_process_cmd(void *device_priv, uint32_t cmd_type,
|
|||
}
|
||||
break;
|
||||
case CAM_ICP_IPE_CMD_DISABLE_CLK:
|
||||
spin_lock_irqsave(&ipe_dev->hw_lock, flags);
|
||||
if (core_info->clk_enable == true)
|
||||
cam_ipe_toggle_clk(soc_info, false);
|
||||
core_info->clk_enable = false;
|
||||
spin_unlock_irqrestore(&ipe_dev->hw_lock, flags);
|
||||
break;
|
||||
case CAM_ICP_IPE_CMD_RESET:
|
||||
spin_lock_irqsave(&ipe_dev->hw_lock, flags);
|
||||
rc = cam_ipe_cmd_reset(soc_info, core_info);
|
||||
spin_unlock_irqrestore(&ipe_dev->hw_lock, flags);
|
||||
break;
|
||||
default:
|
||||
CAM_ERR(CAM_ICP, "Invalid Cmd Type:%u", cmd_type);
|
||||
|
|
|
|||
Loading…
Reference in a new issue