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

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

Merge "msm: camera: Fix bitmap allocation sizes in camera" into dev/msm-4.9-camx

parents 1addf9a9 aae1e6b1

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

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ int cam_req_mgr_util_init(void) 
	spin_unlock_bh(&hdl_tbl_lock);



	bitmap_size = BITS_TO_LONGS(CAM_REQ_MGR_MAX_HANDLES) * sizeof(long);

	hdl_tbl->bitmap = kzalloc(sizeof(bitmap_size), GFP_KERNEL);

	hdl_tbl->bitmap = kzalloc(bitmap_size, GFP_KERNEL);

	if (!hdl_tbl->bitmap) {

		rc = -ENOMEM;

		goto bitmap_alloc_fail;

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

+1 −1
Original line number Diff line number Diff line
@@ -1592,7 +1592,7 @@ static int cam_icp_mgr_acquire_hw(void *hw_mgr_priv, void *acquire_hw_args) 


	bitmap_size = BITS_TO_LONGS(CAM_FRAME_CMD_MAX) * sizeof(long);

	ctx_data->hfi_frame_process.bitmap =

			kzalloc(sizeof(bitmap_size), GFP_KERNEL);

			kzalloc(bitmap_size, GFP_KERNEL);

	ctx_data->hfi_frame_process.bits = bitmap_size * BITS_PER_BYTE;

	mutex_init(&ctx_data->hfi_frame_process.lock);

	mutex_unlock(&ctx_data->ctx_mutex);