From a1f22acc7a59d3372f0b91ad410f796e90cfdd58 Mon Sep 17 00:00:00 2001 From: Kogara Naveen Kumar Date: Tue, 10 May 2022 17:25:07 +0530 Subject: [PATCH] Audio-kernel: Comparison of unsigned value Make unsign value as sign value. Signed-off-by: Kogara Naveen Kumar --- asoc/msm-pcm-loopback-v2.c | 3 +-- dsp/q6afe.c | 53 +++++++++++++++++++------------------- soc/snd_event.c | 2 ++ 3 files changed, 29 insertions(+), 29 deletions(-) mode change 100755 => 100644 dsp/q6afe.c diff --git a/asoc/msm-pcm-loopback-v2.c b/asoc/msm-pcm-loopback-v2.c index 8bb38cb7a6a5..d3dca8db6002 100644 --- a/asoc/msm-pcm-loopback-v2.c +++ b/asoc/msm-pcm-loopback-v2.c @@ -2062,8 +2062,7 @@ static int msm_loopback_adsp_stream_cmd_put(struct snd_kcontrol *kcontrol, audio_client = q6asm_get_audio_client(fe_dai.strm_id); event_data = (struct msm_adsp_event_data *)ucontrol->value.bytes.data; - if ((event_data->event_type < ADSP_STREAM_PP_EVENT) || - (event_data->event_type >= ADSP_STREAM_EVENT_MAX)) { + if (event_data->event_type >= ADSP_STREAM_EVENT_MAX) { pr_err("%s: invalid event_type=%d\n", __func__, event_data->event_type); ret = -EINVAL; diff --git a/dsp/q6afe.c b/dsp/q6afe.c old mode 100755 new mode 100644 index 778b5799817a..5b183d8fddee --- a/dsp/q6afe.c +++ b/dsp/q6afe.c @@ -2144,31 +2144,30 @@ static int afe_send_cal_block(u16 port_id, struct cal_block_data *cal_block) result = -EINVAL; goto done; } - if (cal_block->cal_data.size < 0) { - pr_debug("%s: AFE cal has invalid size!\n", __func__); - result = -EINVAL; - goto done; - } - if (cal_block->cal_data.size == 0) { - pr_debug("%s: AFE cal size is zero!\n", __func__); - goto done; - } - payload_size = cal_block->cal_data.size; - mem_hdr.data_payload_addr_lsw = - lower_32_bits(cal_block->cal_data.paddr); - mem_hdr.data_payload_addr_msw = - msm_audio_populate_upper_32_bits(cal_block->cal_data.paddr); - mem_hdr.mem_map_handle = cal_block->map_data.q6map_handle; + if (cal_block->cal_data.size != 0) { + payload_size = cal_block->cal_data.size; + mem_hdr.data_payload_addr_lsw = + lower_32_bits(cal_block->cal_data.paddr); + mem_hdr.data_payload_addr_msw = + msm_audio_populate_upper_32_bits(cal_block->cal_data.paddr); + mem_hdr.mem_map_handle = cal_block->map_data.q6map_handle; - pr_debug("%s: AFE cal sent for device port = 0x%x, cal size = %zd, cal addr = 0x%pK\n", - __func__, port_id, - cal_block->cal_data.size, &cal_block->cal_data.paddr); + pr_debug("%s: AFE cal sent for device port = 0x%x, cal size = %zd, cal addr = 0x%pK\n", + __func__, port_id, + cal_block->cal_data.size, &cal_block->cal_data.paddr); - result = q6afe_set_params(port_id, q6audio_get_port_index(port_id), + result = q6afe_set_params(port_id, q6audio_get_port_index(port_id), &mem_hdr, NULL, payload_size); - if (result) - pr_err("%s: AFE cal for port 0x%x failed %d\n", - __func__, port_id, result); + if (result) + pr_err("%s: AFE cal for port 0x%x failed %d\n", + __func__, port_id, result); + } + else { + pr_debug("%s: AFE cal has invalid size!\n", __func__); + result = -EINVAL; + goto done; + } + done: return result; @@ -2982,7 +2981,7 @@ int afe_send_cdc_dma_data_align(u16 port_id, u32 cdc_dma_data_align) { struct afe_param_id_cdc_dma_data_align data_align; struct param_hdr_v3 param_info; - uint16_t port_index = 0; + int port_index = 0; int ret = -EINVAL; memset(&data_align, 0, sizeof(data_align)); @@ -3174,7 +3173,7 @@ static int afe_port_topology_deregister(u16 port_id) uint32_t build_major_version = 0; uint32_t build_minor_version = 0; uint32_t build_branch_version = 0; - uint32_t afe_api_version = 0; + int afe_api_version = 0; ret = q6core_get_avcs_avs_build_version_info(&build_major_version, &build_minor_version, @@ -4791,7 +4790,7 @@ EXPORT_SYMBOL(afe_set_island_mode_cfg); */ int afe_get_power_mode_cfg(u16 port_id, u32 *enable_flag) { - uint16_t port_index; + int port_index; int ret = 0; if (enable_flag) { @@ -4815,7 +4814,7 @@ EXPORT_SYMBOL(afe_get_power_mode_cfg); */ int afe_set_power_mode_cfg(u16 port_id, u32 enable_flag) { - uint16_t port_index; + int port_index; int ret= 0; port_index = afe_get_port_index(port_id); @@ -10010,7 +10009,7 @@ int afe_set_lpass_clock_v2(u16 port_id, struct afe_clk_set *cfg) { int index = 0; int ret = 0; - u16 idx = 0; + int idx = 0; uint32_t build_major_version = 0; uint32_t build_minor_version = 0; uint32_t build_branch_version = 0; diff --git a/soc/snd_event.c b/soc/snd_event.c index abc450405fe1..b20cdf422fe2 100644 --- a/soc/snd_event.c +++ b/soc/snd_event.c @@ -304,6 +304,8 @@ void snd_event_mstr_add_client(struct snd_event_clients **snd_clients, GFP_KERNEL); if (!client->cl_arr) { *snd_clients = ERR_PTR(-ENOMEM); + kfree(client); + client = NULL; return; } *snd_clients = client;