samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "asoc: mbhc: avoid null pointer derefrence"

Browse Source
This commit is contained in:
qctecmdr
2024-06-13 07:33:36 -07:00
committed by Gerrit - the friendly Code Review server
parent e96b109ca1 f804586860
commit 759abacde0
2 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
asoc/codecs/wcd9378/wcd9378-mbhc.c
View File

@@ -1036,8 +1036,7 @@ int wcd9378_mbhc_post_ssr_init(struct wcd9378_mbhc *mbhc,
{ {
int ret = 0; int ret = 0;
struct wcd_mbhc *wcd_mbhc = NULL; struct wcd_mbhc *wcd_mbhc = NULL;
struct wcd9378_priv *wcd9378 = struct wcd9378_priv *wcd9378 = NULL;
dev_get_drvdata(component->dev);
if (!mbhc || !component) if (!mbhc || !component)
return -EINVAL; return -EINVAL;
@@ -1048,6 +1047,12 @@ int wcd9378_mbhc_post_ssr_init(struct wcd9378_mbhc *mbhc,
return -EINVAL; return -EINVAL;
} }
wcd9378 = dev_get_drvdata(component->dev);
if (wcd9378 == NULL) {
pr_err("%s: wcd9378 is NULL\n", __func__);
return -EINVAL;
}
/* Reset detection type to insertion after SSR recovery */ /* Reset detection type to insertion after SSR recovery */
snd_soc_component_update_bits(component, WCD9378_ANA_MBHC_MECH, snd_soc_component_update_bits(component, WCD9378_ANA_MBHC_MECH,
0x20, 0x20); 0x20, 0x20);
@@ -1088,14 +1093,19 @@ int wcd9378_mbhc_init(struct wcd9378_mbhc **mbhc,
struct wcd_mbhc *wcd_mbhc = NULL; struct wcd_mbhc *wcd_mbhc = NULL;
int ret = 0; int ret = 0;
struct wcd9378_pdata *pdata; struct wcd9378_pdata *pdata;
struct wcd9378_priv *wcd9378 = struct wcd9378_priv *wcd9378 = NULL;
dev_get_drvdata(component->dev);
if (!component) { if (!component) {
pr_err("%s: component is NULL\n", __func__); pr_err("%s: component is NULL\n", __func__);
return -EINVAL; return -EINVAL;
} }
wcd9378 = dev_get_drvdata(component->dev);
if (!wcd9378) {
pr_err("%s: wcd9378 is NULL\n", __func__);
return -EINVAL;
}
wcd9378_mbhc = devm_kzalloc(component->dev, sizeof(struct wcd9378_mbhc), wcd9378_mbhc = devm_kzalloc(component->dev, sizeof(struct wcd9378_mbhc),
GFP_KERNEL); GFP_KERNEL);
if (!wcd9378_mbhc) if (!wcd9378_mbhc)

17
asoc/codecs/wcd939x/wcd939x-mbhc.c
View File

@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved. * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
@@ -836,6 +836,9 @@ static void interpolate_zdet_val(uint32_t *z, s64 z_meas_bias_removed, s64 z_val
{ {
s64 lb_to_z = 0, lb_to_ub = 0, z_to_ub = 0, lb_corr = 0, ub_corr = 0, z_interp = 0; s64 lb_to_z = 0, lb_to_ub = 0, z_to_ub = 0, lb_corr = 0, ub_corr = 0, z_interp = 0;
if (lb < 0)
return;
/* If lb is the table upper bound, no interpolation needed, just use the lb corr factor */ /* If lb is the table upper bound, no interpolation needed, just use the lb corr factor */
if ((lb + 1) >= ARRAY_SIZE(zdet_dnl_table)) { if ((lb + 1) >= ARRAY_SIZE(zdet_dnl_table)) {
z_interp = (s64) ((flag_se_diff) ? (zdet_dnl_table[lb].diff_corr_mohms) : z_interp = (s64) ((flag_se_diff) ? (zdet_dnl_table[lb].diff_corr_mohms) :
@@ -977,10 +980,16 @@ static ssize_t usbcss_sysfs_store(struct kobject *kobj, struct kobj_attribute *a
bool update_xtalk = false, update_linearizer = false; bool update_xtalk = false, update_linearizer = false;
usbc_attr = container_of(attr, struct usbcss_hs_attr, attr); usbc_attr = container_of(attr, struct usbcss_hs_attr, attr);
wcd939x = usbc_attr->priv; if (!usbc_attr)
pdata = dev_get_platdata(wcd939x->dev); return -EINVAL;
if (!wcd939x || !pdata) wcd939x = usbc_attr->priv;
if (!wcd939x)
return -EINVAL;
pdata = dev_get_platdata(wcd939x->dev);
if (!pdata)
return -EINVAL; return -EINVAL;
usbcss_hs = &pdata->usbcss_hs; usbcss_hs = &pdata->usbcss_hs;