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

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

Merge "sound: usb: Fix compile warnings"

parents 9a64886b e7fe90f3

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

+7 −7
Original line number Diff line number Diff line
@@ -3813,7 +3813,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);
@@ -3844,7 +3844,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));
@@ -3876,7 +3876,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));
@@ -3917,7 +3917,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);
@@ -3949,7 +3949,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_v2) * 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_v2) * 2);
@@ -3966,7 +3966,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;
@@ -3984,7 +3984,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;

		}

drivers/platform/msm/gsi/gsi.c

+1 −1
Original line number Diff line number Diff line
@@ -3697,7 +3697,7 @@ int gsi_config_channel_mode(unsigned long chan_hdl, enum gsi_chan_mode mode) 
				spin_unlock_irqrestore(

					&ctx->evtr->ring.slock, flags);

				ctx->stats.poll_pending_irq++;

				GSIDBG("In IEOB WA pnd cnt = %d prvmode = %d\n",

				GSIDBG("In IEOB WA pnd cnt = %ld prvmode = %d\n",

						ctx->stats.poll_pending_irq,

						chan_mode);

				if (chan_mode == GSI_CHAN_MODE_POLL)

drivers/thermal/qcom/cpu_isolate.c

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static void cpu_isolate_register_cdev(struct work_struct *work) 
					&cpu_isolate_cooling_ops);

	if (IS_ERR(cpu_isolate_cdev->cdev)) {

		ret = PTR_ERR(cpu_isolate_cdev->cdev);

		pr_err("Cooling register failed for %s, ret:%ld\n",

		pr_err("Cooling register failed for %s, ret:%d\n",

			cdev_name, ret);

		cpu_isolate_cdev->cdev = NULL;

		return;

sound/usb/usb_audio_qmi_svc.c

+1 −1
Original line number Diff line number Diff line
@@ -1235,7 +1235,7 @@ static void uaudio_qmi_bye_cb(struct qmi_handle *handle, unsigned int node) 
	}



	if (svc->client_connected && svc->client_sq.sq_node == node) {

		uaudio_dbg("node:\n", node);

		uaudio_dbg("node: %d\n", node);

		queue_work(svc->uaudio_wq, &svc->qmi_disconnect_work);

		svc->client_sq.sq_node = 0;

		svc->client_sq.sq_port = 0;