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

Merge "asoc: wcd: add NULL pointer check for wcd component"

Browse Source
This commit is contained in:
qctecmdr
2022-11-22 07:28:44 -08:00
committed by Gerrit - the friendly Code Review server
parent bca378d01d c9ec60ea62
commit 8a3a2be86e
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
asoc/codecs/wcd938x/wcd938x.c
View File

@@ -4681,8 +4681,9 @@ static int wcd938x_suspend(struct device *dev)
clear_bit(ALLOW_BUCK_DISABLE, &wcd938x->status_mask); clear_bit(ALLOW_BUCK_DISABLE, &wcd938x->status_mask);
} }
if (wcd938x->dapm_bias_off || if (wcd938x->dapm_bias_off ||
(wcd938x->component &&
(snd_soc_component_get_bias_level(wcd938x->component) == (snd_soc_component_get_bias_level(wcd938x->component) ==
SND_SOC_BIAS_OFF)) { SND_SOC_BIAS_OFF))) {
msm_cdc_set_supplies_lpm_mode(wcd938x->dev, msm_cdc_set_supplies_lpm_mode(wcd938x->dev,
wcd938x->supplies, wcd938x->supplies,
pdata->regulator, pdata->regulator,

3
asoc/codecs/wcd939x/wcd939x.c
View File

@@ -4483,8 +4483,9 @@ static int wcd939x_suspend(struct device *dev)
clear_bit(ALLOW_BUCK_DISABLE, &wcd939x->status_mask); clear_bit(ALLOW_BUCK_DISABLE, &wcd939x->status_mask);
} }
if (wcd939x->dapm_bias_off || if (wcd939x->dapm_bias_off ||
(wcd939x->component &&
(snd_soc_component_get_bias_level(wcd939x->component) == (snd_soc_component_get_bias_level(wcd939x->component) ==
SND_SOC_BIAS_OFF)) { SND_SOC_BIAS_OFF))) {
msm_cdc_set_supplies_lpm_mode(wcd939x->dev, msm_cdc_set_supplies_lpm_mode(wcd939x->dev,
wcd939x->supplies, wcd939x->supplies,
pdata->regulator, pdata->regulator,