Merge "msm: camera: req_mgr: Fix deadlock in ICP driver in close" into camera-kernel.lnx.5.0

drivers/cam_icp/cam_icp_subdev.c

@@ -107,8 +107,8 @@ int cam_icp_subdev_close_internal(struct v4l2_subdev *sd,
 
 	mutex_lock(&g_icp_dev.icp_lock);
 	if (g_icp_dev.open_cnt <= 0) {
-		CAM_WARN(CAM_ICP, "ICP subdev is already closed");
-		return 0;
+		CAM_DBG(CAM_ICP, "ICP subdev is already closed");
+		goto end;
 	}
 	g_icp_dev.open_cnt--;
 	if (!node) {

drivers/cam_sensor_module/cam_actuator/cam_actuator_dev.c

@@ -34,7 +34,7 @@ static int cam_actuator_subdev_close(struct v4l2_subdev *sd,
 	bool crm_active = cam_req_mgr_is_open(CAM_ACTUATOR);
 
 	if (crm_active) {
-		CAM_INFO(CAM_ACTUATOR,
+		CAM_DBG(CAM_ACTUATOR,
 			"CRM is ACTIVE, close should be from CRM");
 		return 0;
 	}

drivers/cam_sensor_module/cam_csiphy/cam_csiphy_dev.c

@@ -116,7 +116,7 @@ static int cam_csiphy_subdev_close(struct v4l2_subdev *sd,
 	bool crm_active = cam_req_mgr_is_open(CAM_CSIPHY);
 
 	if (crm_active) {
-		CAM_INFO(CAM_CSIPHY, "CRM is ACTIVE, close should be from CRM");
+		CAM_DBG(CAM_CSIPHY, "CRM is ACTIVE, close should be from CRM");
 		return 0;
 	}
 

drivers/cam_sensor_module/cam_eeprom/cam_eeprom_dev.c

@@ -34,7 +34,7 @@ static int cam_eeprom_subdev_close(struct v4l2_subdev *sd,
 	bool crm_active = cam_req_mgr_is_open(CAM_EEPROM);
 
 	if (crm_active) {
-		CAM_INFO(CAM_EEPROM, "CRM is ACTIVE, close should be from CRM");
+		CAM_DBG(CAM_EEPROM, "CRM is ACTIVE, close should be from CRM");
 		return 0;
 	}
 

drivers/cam_sensor_module/cam_flash/cam_flash_dev.c

@@ -260,7 +260,7 @@ static int cam_flash_subdev_close(struct v4l2_subdev *sd,
 	bool crm_active = cam_req_mgr_is_open(CAM_FLASH);
 
 	if (crm_active) {
-		CAM_INFO(CAM_FLASH, "CRM is ACTIVE, close should be from CRM");
+		CAM_DBG(CAM_FLASH, "CRM is ACTIVE, close should be from CRM");
 		return 0;
 	}
 

drivers/cam_sensor_module/cam_ois/cam_ois_dev.c

@@ -34,7 +34,7 @@ static int cam_ois_subdev_close(struct v4l2_subdev *sd,
 	bool crm_active = cam_req_mgr_is_open(CAM_OIS);
 
 	if (crm_active) {
-		CAM_INFO(CAM_OIS, "CRM is ACTIVE, close should be from CRM");
+		CAM_DBG(CAM_OIS, "CRM is ACTIVE, close should be from CRM");
 		return 0;
 	}
 

drivers/cam_sensor_module/cam_sensor/cam_sensor_dev.c

@@ -33,7 +33,7 @@ static int cam_sensor_subdev_close(struct v4l2_subdev *sd,
 	bool crm_active = cam_req_mgr_is_open(CAM_SENSOR);
 
 	if (crm_active) {
-		CAM_INFO(CAM_SENSOR, "CRM is ACTIVE, close should be from CRM");
+		CAM_DBG(CAM_SENSOR, "CRM is ACTIVE, close should be from CRM");
 		return 0;
 	}