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

Commit 57d0b82d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: wcd9xxx: Handle typecast of variables"

parents e1dfe27e f3128628

sound/soc/codecs/wcd9330.c

+6 −6
Original line number Diff line number Diff line
@@ -2847,7 +2847,7 @@ static int tomtom_codec_config_mad(struct snd_soc_codec *codec) 
	}



	if (fw->size < sizeof(struct mad_audio_cal)) {

		pr_err("%s: incorrect firmware size %u\n", __func__, fw->size);

		pr_err("%s: incorrect firmware size %zu\n", __func__, fw->size);

		release_firmware(fw);

		return -ENOMEM;

	}
@@ -3494,7 +3494,7 @@ static int tomtom_codec_enable_anc(struct snd_soc_dapm_widget *w, 


		/* First number is the number of register writes */

		anc_head = (struct wcd9xxx_anc_header *)(fw->data);

		anc_ptr = (u32 *)((u32)fw->data +

		anc_ptr = (u32 *)(fw->data +

				  sizeof(struct wcd9xxx_anc_header));

		anc_size_remaining = fw->size -

				     sizeof(struct wcd9xxx_anc_header);
@@ -4741,8 +4741,8 @@ static int tomtom_get_channel_map(struct snd_soc_dai *dai, 
	case AIF2_PB:

	case AIF3_PB:

		if (!rx_slot || !rx_num) {

			pr_err("%s: Invalid rx_slot %d or rx_num %d\n",

				 __func__, (u32) rx_slot, (u32) rx_num);

			pr_err("%s: Invalid rx_slot %p or rx_num %p\n",

				 __func__, rx_slot, rx_num);

			return -EINVAL;

		}

		list_for_each_entry(ch, &tomtom_p->dai[dai->id].wcd9xxx_ch_list,
@@ -4760,8 +4760,8 @@ static int tomtom_get_channel_map(struct snd_soc_dai *dai, 
	case AIF4_VIFEED:

	case AIF4_MAD_TX:

		if (!tx_slot || !tx_num) {

			pr_err("%s: Invalid tx_slot %d or tx_num %d\n",

				 __func__, (u32) tx_slot, (u32) tx_num);

			pr_err("%s: Invalid tx_slot %p or tx_num %p\n",

				 __func__, tx_slot, tx_num);

			return -EINVAL;

		}

		list_for_each_entry(ch, &tomtom_p->dai[dai->id].wcd9xxx_ch_list,

sound/soc/codecs/wcd_cpe_services.c

+2 −2
Original line number Diff line number Diff line
@@ -1397,7 +1397,7 @@ enum cmi_api_result cmi_send_msg(void *message) 


	msg->payload = kzalloc(msg->size, GFP_ATOMIC);

	if (!msg->payload) {

		pr_err("%s: no memory for cmi payload, sz = %d\n",

		pr_err("%s: no memory for cmi payload, sz = %zd\n",

			__func__, msg->size);

		kfree(msg);

		return CPE_SVC_NO_MEMORY;
@@ -1536,7 +1536,7 @@ static enum cpe_svc_result cpe_get_mem_addr(struct cpe_info *t_info, 


	address = mem_seg->cpe_addr - offset;

	if (address + mem_seg->size > mem_sz) {

		pr_err("%s: wrong size %u, start adress %x, mem_type %u\n",

		pr_err("%s: wrong size %zu, start adress %x, mem_type %u\n",

			__func__, mem_seg->size, address, mem_type);

		return CPE_SVC_INVALID_HANDLE;

	}