Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d927c31 authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: cdm: Fix false negative in streamoff" into dev/msm-4.9-camx

parents 7104859b 0577010b

drivers/media/platform/msm/camera/cam_cdm/cam_cdm_core_common.c

+1 −0
Original line number Diff line number Diff line
@@ -338,6 +338,7 @@ int cam_cdm_stream_ops_internal(void *hw_priv, 
				}

			} else {

				client->stream_on = false;

				rc = 0;

				CAM_DBG(CAM_CDM,

					"Client stream off success =%d",

					cdm_hw->open_count);

drivers/media/platform/msm/camera/cam_cdm/cam_cdm_virtual_core.c

+4 −2
Original line number Diff line number Diff line
@@ -131,8 +131,10 @@ int cam_virtual_cdm_submit_bl(struct cam_hw_info *cdm_hw, 
				cdm_cmd->cmd[i].len, client->data.base_array,

				client->data.base_array_cnt, core->bl_tag);

			if (rc) {

				CAM_ERR(CAM_CDM, "write failed for cnt=%d:%d",

					i, req->data->cmd_arrary_count);

				CAM_ERR(CAM_CDM,

					"write failed for cnt=%d:%d len %u",

					i, req->data->cmd_arrary_count,

					cdm_cmd->cmd[i].len);

				break;

			}

		} else {