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

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

Merge "msm: cam: icp: Use correct macro for input resources" into dev/msm-4.9-camx

parents 7626b6fd f13f75cd

drivers/media/platform/msm/camera/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -2169,7 +2169,7 @@ static int cam_icp_mgr_process_io_cfg(struct cam_icp_hw_mgr *hw_mgr, 
{

	int i, j, k, rc = 0;

	struct cam_buf_io_cfg *io_cfg_ptr = NULL;

	int32_t sync_in_obj[CAM_MAX_OUT_RES];

	int32_t sync_in_obj[CAM_MAX_IN_RES];

	int32_t merged_sync_in_obj;



	io_cfg_ptr = (struct cam_buf_io_cfg *) ((uint32_t *) &packet->payload +

drivers/media/platform/msm/camera/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#define CAM_FRAME_CMD_MAX       20



#define CAM_MAX_OUT_RES         6

#define CAM_MAX_IN_RES          8



#define ICP_WORKQ_NUM_TASK      100

#define ICP_WORKQ_TASK_CMD_TYPE 1