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

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

Merge "msm: camera: Modify size field in icp handles" into dev/msm-4.9-camx

parents 06406e5f 15abc70d

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

+2 −6
Original line number Diff line number Diff line
@@ -652,9 +652,7 @@ static int cam_icp_mgr_abort_handle( 
		return -ENOMEM;



	abort_cmd.size =

		sizeof(struct hfi_cmd_ipebps_async) +

		sizeof(struct hfi_cmd_abort_destroy) -

		sizeof(abort_cmd.payload.direct);

		sizeof(struct hfi_cmd_ipebps_async);

	abort_cmd.pkt_type = HFI_CMD_IPEBPS_ASYNC_COMMAND_DIRECT;

	if (ctx_data->icp_dev_acquire_info->dev_type == CAM_ICP_RES_TYPE_BPS)

		abort_cmd.opcode = HFI_IPEBPS_CMD_OPCODE_BPS_ABORT;
@@ -706,9 +704,7 @@ static int cam_icp_mgr_destroy_handle( 
		return -ENOMEM;



	destroy_cmd.size =

		sizeof(struct hfi_cmd_ipebps_async) +

		sizeof(struct ipe_bps_destroy) -

		sizeof(destroy_cmd.payload.direct);

		sizeof(struct hfi_cmd_ipebps_async);

	destroy_cmd.pkt_type = HFI_CMD_IPEBPS_ASYNC_COMMAND_DIRECT;

	if (ctx_data->icp_dev_acquire_info->dev_type == CAM_ICP_RES_TYPE_BPS)

		destroy_cmd.opcode = HFI_IPEBPS_CMD_OPCODE_BPS_DESTROY;