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

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

Merge "msm: camera: memmgr: Allow alloc flags with 0" into dev/msm-4.14-camx

parents b2825ae7 7ecbb939

drivers/media/platform/msm/camera/cam_req_mgr/cam_mem_mgr.c

+2 −7
Original line number Diff line number Diff line
@@ -447,13 +447,8 @@ static int cam_mem_util_ion_alloc(struct cam_mem_mgr_alloc_cmd *cmd, 
}





static int cam_mem_util_check_flags(struct cam_mem_mgr_alloc_cmd *cmd)

static int cam_mem_util_check_alloc_flags(struct cam_mem_mgr_alloc_cmd *cmd)

{

	if (!cmd->flags) {

		CAM_ERR(CAM_MEM, "Invalid flags");

		return -EINVAL;

	}



	if (cmd->num_hdl > CAM_MEM_MMU_MAX_HANDLE) {

		CAM_ERR(CAM_MEM, "Num of mmu hdl exceeded maximum(%d)",

			CAM_MEM_MMU_MAX_HANDLE);
@@ -576,7 +571,7 @@ int cam_mem_mgr_alloc_and_map(struct cam_mem_mgr_alloc_cmd *cmd) 
	}

	len = cmd->len;



	rc = cam_mem_util_check_flags(cmd);

	rc = cam_mem_util_check_alloc_flags(cmd);

	if (rc) {

		CAM_ERR(CAM_MEM, "Invalid flags: flags = %X", cmd->flags);

		return rc;