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

Commit 415c76f8 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ais: Fix CAM_ERR formatting error"

parents 8ec1a318 95437d6b

drivers/media/platform/msm/ais/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+6 −6
Original line number Diff line number Diff line
@@ -3637,7 +3637,7 @@ static int cam_isp_packet_generic_blob_handler(void *user_data, 


		if (blob_size < (sizeof(uint32_t) * 2 + hfr_config->num_ports *

			sizeof(struct cam_isp_port_hfr_config))) {

			CAM_ERR(CAM_ISP, "Invalid blob size %u expected %u",

			CAM_ERR(CAM_ISP, "Invalid blob size %u expected %lu",

				blob_size, sizeof(uint32_t) * 2 +

				sizeof(struct cam_isp_port_hfr_config) *

				hfr_config->num_ports);
@@ -3668,7 +3668,7 @@ static int cam_isp_packet_generic_blob_handler(void *user_data, 


		if (blob_size < (sizeof(uint32_t) * 2 + sizeof(uint64_t) *

			(clock_config->num_rdi + 2))) {

			CAM_ERR(CAM_ISP, "Invalid blob size %u expected %u",

			CAM_ERR(CAM_ISP, "Invalid blob size %u expected %lu",

				blob_size,

				sizeof(uint32_t) * 2 + sizeof(uint64_t) *

				(clock_config->num_rdi + 2));
@@ -3700,7 +3700,7 @@ static int cam_isp_packet_generic_blob_handler(void *user_data, 


		if (blob_size < (sizeof(uint32_t) * 2 + (bw_config->num_rdi + 2)

			* sizeof(struct cam_isp_bw_vote))) {

			CAM_ERR(CAM_ISP, "Invalid blob size %u expected %u",

			CAM_ERR(CAM_ISP, "Invalid blob size %u expected %lu",

				blob_size,

				sizeof(uint32_t) * 2 + (bw_config->num_rdi + 2)

				* sizeof(struct cam_isp_bw_vote));
@@ -3788,7 +3788,7 @@ static int cam_isp_packet_generic_blob_handler(void *user_data, 


		if (blob_size < (sizeof(uint32_t) * 2 + ubwc_config->num_ports *

			sizeof(struct cam_ubwc_plane_cfg_v1) * 2)) {

			CAM_ERR(CAM_ISP, "Invalid blob_size %u expected %u",

			CAM_ERR(CAM_ISP, "Invalid blob_size %u expected %lu",

				blob_size,

				sizeof(uint32_t) * 2 + ubwc_config->num_ports *

				sizeof(struct cam_ubwc_plane_cfg_v1) * 2);
@@ -3805,7 +3805,7 @@ static int cam_isp_packet_generic_blob_handler(void *user_data, 
		struct cam_isp_csid_clock_config    *clock_config;



		if (blob_size < sizeof(struct cam_isp_csid_clock_config)) {

			CAM_ERR(CAM_ISP, "Invalid blob size %u expected %u",

			CAM_ERR(CAM_ISP, "Invalid blob size %u expected %lu",

				blob_size,

				sizeof(struct cam_isp_csid_clock_config));

			return -EINVAL;
@@ -3823,7 +3823,7 @@ static int cam_isp_packet_generic_blob_handler(void *user_data, 
		struct cam_fe_config *fe_config;



		if (blob_size < sizeof(struct cam_fe_config)) {

			CAM_ERR(CAM_ISP, "Invalid blob size %u expected %u",

			CAM_ERR(CAM_ISP, "Invalid blob size %u expected %lu",

				blob_size, sizeof(struct cam_fe_config));

			return -EINVAL;

		}