mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-11 07:03:09 -04:00
asoc: Reslove audiodlkm error & warn & issues
Fix potential deadlock by creating another goto-label Fix potential memory-leak (free space for each error after space was allocated) Change order of destroy for mutexes in init-fucnction (last created mutex should be destroyed first) Change-Id: I9ad8849a166af247eed6e7667da73d537ca7d2a2 Signed-off-by: Jing Wang <jingwa@codeaurora.org>
This commit is contained in:
Jing Wang
parent
997c13ca29
commit
65bd6329c3
4 changed files with 37 additions and 37 deletions
|
|
@ -930,8 +930,6 @@ static int usb_audio_tx_format_get(struct snd_kcontrol *kcontrol,
|
|||
static int usb_audio_tx_format_put(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
int rc = 0;
|
||||
|
||||
switch (ucontrol->value.integer.value[0]) {
|
||||
case 3:
|
||||
usb_tx_cfg.bit_format = SNDRV_PCM_FORMAT_S32_LE;
|
||||
|
|
@ -951,7 +949,7 @@ static int usb_audio_tx_format_put(struct snd_kcontrol *kcontrol,
|
|||
__func__, usb_tx_cfg.bit_format,
|
||||
ucontrol->value.integer.value[0]);
|
||||
|
||||
return rc;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int usb_audio_rx_ch_get(struct snd_kcontrol *kcontrol,
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2016-2018, 2021, The Linux Foundation. All rights reserved.
|
||||
*/
|
||||
|
||||
#include <linux/regmap.h>
|
||||
|
|
@ -1832,6 +1832,8 @@ int wcd934x_regmap_register_patch(struct regmap *regmap, int revision)
|
|||
ARRAY_SIZE(wcd934x_1_1_defaults));
|
||||
regcache_cache_only(regmap, false);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return rc;
|
||||
|
|
|
|||
|
|
@ -638,9 +638,9 @@ err:
|
|||
wcd9xxx_bringdown(wcd9xxx->dev);
|
||||
wcd9xxx_core_res_deinit(&wcd9xxx->core_res);
|
||||
err_bring_up:
|
||||
mutex_destroy(&wcd9xxx->io_lock);
|
||||
mutex_destroy(&wcd9xxx->xfer_lock);
|
||||
mutex_destroy(&wcd9xxx->reset_lock);
|
||||
mutex_destroy(&wcd9xxx->xfer_lock);
|
||||
mutex_destroy(&wcd9xxx->io_lock);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/* Copyright (c) 2014-2020, The Linux Foundation. All rights reserved.
|
||||
/* Copyright (c) 2014-2021, The Linux Foundation. All rights reserved.
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
|
|
@ -756,7 +756,7 @@ static unsigned int wcd_cpe_state_poll(struct snd_info_entry *entry,
|
|||
*/
|
||||
static bool wcd_cpe_is_online_state(void *core_handle)
|
||||
{
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
|
||||
if (core_handle) {
|
||||
return !core->ssr_entry.offline;
|
||||
|
|
@ -1098,7 +1098,7 @@ err_ret:
|
|||
int wcd_cpe_ssr_event(void *core_handle,
|
||||
enum wcd_cpe_ssr_state_event event)
|
||||
{
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
|
||||
if (!core) {
|
||||
pr_err("%s: Invalid handle to core\n",
|
||||
|
|
@ -2169,7 +2169,7 @@ static int wcd_cpe_cmi_send_lsm_msg(
|
|||
void *message)
|
||||
{
|
||||
int ret = 0;
|
||||
struct cmi_hdr *hdr = message;
|
||||
struct cmi_hdr *hdr = (struct cmi_hdr *)message;
|
||||
|
||||
pr_debug("%s: sending message with opcode 0x%x\n",
|
||||
__func__, hdr->opcode);
|
||||
|
|
@ -2413,7 +2413,7 @@ static int wcd_cpe_cmd_lsm_open_tx(void *core_handle,
|
|||
u16 app_id, u16 sample_rate)
|
||||
{
|
||||
struct cpe_lsm_cmd_open_tx cmd_open_tx;
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
int ret = 0;
|
||||
|
||||
ret = wcd_cpe_is_valid_lsm_session(core, session,
|
||||
|
|
@ -2462,7 +2462,7 @@ static int wcd_cpe_cmd_lsm_close_tx(void *core_handle,
|
|||
struct cpe_lsm_session *session)
|
||||
{
|
||||
struct cmi_hdr cmd_close_tx;
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
int ret = 0;
|
||||
|
||||
ret = wcd_cpe_is_valid_lsm_session(core, session,
|
||||
|
|
@ -2503,7 +2503,7 @@ static int wcd_cpe_cmd_lsm_shmem_alloc(void *core_handle,
|
|||
u32 size)
|
||||
{
|
||||
struct cpe_cmd_shmem_alloc cmd_shmem_alloc;
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
int ret = 0;
|
||||
|
||||
ret = wcd_cpe_is_valid_lsm_session(core, session,
|
||||
|
|
@ -2542,7 +2542,7 @@ static int wcd_cpe_cmd_lsm_shmem_dealloc(void *core_handle,
|
|||
struct cpe_lsm_session *session)
|
||||
{
|
||||
struct cpe_cmd_shmem_dealloc cmd_dealloc;
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
int ret = 0;
|
||||
|
||||
ret = wcd_cpe_is_valid_lsm_session(core, session,
|
||||
|
|
@ -3021,7 +3021,7 @@ static int wcd_cpe_set_one_param(void *core_handle,
|
|||
struct cpe_lsm_session *session, struct lsm_params_info *p_info,
|
||||
void *data, uint32_t param_type)
|
||||
{
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
int rc = 0;
|
||||
struct cpe_lsm_ids ids;
|
||||
|
||||
|
|
@ -3111,7 +3111,7 @@ static int wcd_cpe_lsm_set_data(void *core_handle,
|
|||
enum lsm_detection_mode detect_mode,
|
||||
bool detect_failure)
|
||||
{
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
struct cpe_lsm_ids ids;
|
||||
int ret = 0;
|
||||
|
||||
|
|
@ -3160,7 +3160,7 @@ static int wcd_cpe_lsm_reg_snd_model(void *core_handle,
|
|||
{
|
||||
int ret = 0;
|
||||
struct cmi_obm_msg obm_msg;
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
|
||||
ret = wcd_cpe_is_valid_lsm_session(core, session,
|
||||
__func__);
|
||||
|
|
@ -3213,7 +3213,7 @@ static int wcd_cpe_lsm_dereg_snd_model(void *core_handle,
|
|||
struct cpe_lsm_session *session)
|
||||
{
|
||||
struct cmi_hdr cmd_dereg_snd_model;
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
int ret = 0;
|
||||
|
||||
ret = wcd_cpe_is_valid_lsm_session(core, session,
|
||||
|
|
@ -3248,7 +3248,7 @@ end_ret:
|
|||
static int wcd_cpe_lsm_get_afe_out_port_id(void *core_handle,
|
||||
struct cpe_lsm_session *session)
|
||||
{
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
struct snd_soc_component *component;
|
||||
int rc = 0;
|
||||
|
||||
|
|
@ -3302,7 +3302,7 @@ static int wcd_cpe_cmd_lsm_start(void *core_handle,
|
|||
struct cpe_lsm_session *session)
|
||||
{
|
||||
struct cmi_hdr cmd_lsm_start;
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
int ret = 0;
|
||||
|
||||
ret = wcd_cpe_is_valid_lsm_session(core, session,
|
||||
|
|
@ -3337,7 +3337,7 @@ static int wcd_cpe_cmd_lsm_stop(void *core_handle,
|
|||
struct cpe_lsm_session *session)
|
||||
{
|
||||
struct cmi_hdr cmd_lsm_stop;
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
int ret = 0;
|
||||
|
||||
ret = wcd_cpe_is_valid_lsm_session(core, session,
|
||||
|
|
@ -3376,7 +3376,7 @@ static struct cpe_lsm_session *wcd_cpe_alloc_lsm_session(
|
|||
{
|
||||
struct cpe_lsm_session *session;
|
||||
int i, session_id = -1;
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
bool afe_register_service = false;
|
||||
int ret = 0;
|
||||
|
||||
|
|
@ -3537,7 +3537,7 @@ static int wcd_cpe_lsm_lab_control(
|
|||
struct cpe_lsm_session *session,
|
||||
bool enable)
|
||||
{
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
int ret = 0, pld_size = CPE_PARAM_SIZE_LSM_LAB_CONTROL;
|
||||
struct cpe_lsm_control_lab cpe_lab_enable;
|
||||
struct cpe_lsm_lab_enable *lab_enable = &cpe_lab_enable.lab_enable;
|
||||
|
|
@ -3620,7 +3620,7 @@ static int wcd_cpe_lsm_eob(
|
|||
static int wcd_cpe_dealloc_lsm_session(void *core_handle,
|
||||
struct cpe_lsm_session *session)
|
||||
{
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
int ret = 0;
|
||||
|
||||
WCD_CPE_GRAB_LOCK(&core->session_lock, "session_lock");
|
||||
|
|
@ -3667,7 +3667,7 @@ static int wcd_cpe_lab_ch_setup(void *core_handle,
|
|||
struct cpe_lsm_session *session,
|
||||
enum wcd_cpe_event event)
|
||||
{
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
struct snd_soc_component *component;
|
||||
int rc = 0;
|
||||
u8 cpe_intr_bits;
|
||||
|
|
@ -3791,7 +3791,7 @@ static int wcd_cpe_lsm_set_fmt_cfg(void *core_handle,
|
|||
{
|
||||
int ret;
|
||||
struct cpe_lsm_output_format_cfg out_fmt_cfg;
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
|
||||
ret = wcd_cpe_is_valid_lsm_session(core, session, __func__);
|
||||
if (ret)
|
||||
|
|
@ -3835,7 +3835,7 @@ static int wcd_cpe_lsm_set_media_fmt_params(void *core_handle,
|
|||
{
|
||||
struct cpe_lsm_media_fmt_param media_fmt;
|
||||
struct cmi_hdr *msg_hdr = &media_fmt.hdr;
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
struct cpe_param_data *param_d = &media_fmt.param;
|
||||
struct cpe_lsm_ids ids;
|
||||
int ret;
|
||||
|
|
@ -3878,7 +3878,7 @@ static int wcd_cpe_lsm_set_port(void *core_handle,
|
|||
u32 port_id;
|
||||
int ret;
|
||||
struct cpe_lsm_ids ids;
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
|
||||
ret = wcd_cpe_is_valid_lsm_session(core, session, __func__);
|
||||
if (ret)
|
||||
|
|
@ -3972,7 +3972,7 @@ static int wcd_cpe_cmi_send_afe_msg(
|
|||
void *message)
|
||||
{
|
||||
int ret = 0;
|
||||
struct cmi_hdr *hdr = message;
|
||||
struct cmi_hdr *hdr = (struct cmi_hdr *)message;
|
||||
|
||||
pr_debug("%s: sending message with opcode 0x%x\n",
|
||||
__func__, hdr->opcode);
|
||||
|
|
@ -4116,7 +4116,7 @@ static int wcd_cpe_send_afe_cal(void *core_handle,
|
|||
{
|
||||
|
||||
struct cal_block_data *afe_cal = NULL;
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
struct cmi_obm_msg obm_msg;
|
||||
void *inb_msg = NULL;
|
||||
void *msg;
|
||||
|
|
@ -4270,7 +4270,7 @@ static int wcd_cpe_afe_svc_cmd_mode(void *core_handle,
|
|||
u8 mode)
|
||||
{
|
||||
struct cpe_afe_svc_cmd_mode afe_mode;
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
struct wcd_cmi_afe_port_data *afe_port_d;
|
||||
int ret;
|
||||
|
||||
|
|
@ -4309,7 +4309,7 @@ static int wcd_cpe_afe_cmd_port_cfg(void *core_handle,
|
|||
struct wcd_cpe_afe_port_cfg *afe_cfg)
|
||||
{
|
||||
struct cpe_afe_cmd_port_cfg port_cfg_cmd;
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
struct wcd_cmi_afe_port_data *afe_port_d;
|
||||
int ret;
|
||||
|
||||
|
|
@ -4364,7 +4364,7 @@ static int wcd_cpe_afe_set_params(void *core_handle,
|
|||
struct cpe_afe_params afe_params;
|
||||
struct cpe_afe_hw_mad_ctrl *hw_mad_ctrl = &afe_params.hw_mad_ctrl;
|
||||
struct cpe_afe_port_cfg *port_cfg = &afe_params.port_cfg;
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
struct wcd_cmi_afe_port_data *afe_port_d;
|
||||
int ret = 0, pld_size = 0;
|
||||
|
||||
|
|
@ -4434,7 +4434,7 @@ static int wcd_cpe_afe_port_start(void *core_handle,
|
|||
{
|
||||
|
||||
struct cmi_hdr hdr;
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
struct wcd_cmi_afe_port_data *afe_port_d;
|
||||
int ret = 0;
|
||||
|
||||
|
|
@ -4470,7 +4470,7 @@ static int wcd_cpe_afe_port_stop(void *core_handle,
|
|||
struct wcd_cpe_afe_port_cfg *port_cfg)
|
||||
{
|
||||
struct cmi_hdr hdr;
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
struct wcd_cmi_afe_port_data *afe_port_d;
|
||||
int ret = 0;
|
||||
|
||||
|
|
@ -4507,7 +4507,7 @@ static int wcd_cpe_afe_port_suspend(void *core_handle,
|
|||
struct wcd_cpe_afe_port_cfg *port_cfg)
|
||||
{
|
||||
struct cmi_hdr hdr;
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
struct wcd_cmi_afe_port_data *afe_port_d;
|
||||
int ret = 0;
|
||||
|
||||
|
|
@ -4543,7 +4543,7 @@ static int wcd_cpe_afe_port_resume(void *core_handle,
|
|||
struct wcd_cpe_afe_port_cfg *port_cfg)
|
||||
{
|
||||
struct cmi_hdr hdr;
|
||||
struct wcd_cpe_core *core = core_handle;
|
||||
struct wcd_cpe_core *core = (struct wcd_cpe_core *)core_handle;
|
||||
struct wcd_cmi_afe_port_data *afe_port_d;
|
||||
int ret = 0;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue