Browse Source

Merge "msm: camera: tfe: Update csid init hw failure call flow" into camera-kernel.lnx.7.0

Camera Software Integration 1 year ago
parent
commit
82d5f92463

+ 0 - 3
drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid_core.c

@@ -2872,9 +2872,6 @@ static int cam_tfe_csid_init_hw(void *hw_priv,
 	if (rc < 0)
 	if (rc < 0)
 		CAM_ERR(CAM_ISP, "CSID: Failed in SW reset");
 		CAM_ERR(CAM_ISP, "CSID: Failed in SW reset");
 
 
-	if (rc)
-		cam_tfe_csid_disable_hw(csid_hw);
-
 	spin_lock_irqsave(&csid_hw->spin_lock, flags);
 	spin_lock_irqsave(&csid_hw->spin_lock, flags);
 	csid_hw->device_enabled = 1;
 	csid_hw->device_enabled = 1;
 	spin_unlock_irqrestore(&csid_hw->spin_lock, flags);
 	spin_unlock_irqrestore(&csid_hw->spin_lock, flags);