A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-12 07:37:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "ASoC: wcd934x: check sound card state to avoid pointer dereference"

Browse source
This commit is contained in:
Linux Build Service Account 2018-09-21 08:30:42 -07:00 • committed by Gerrit - the friendly Code Review server
commit 7d2fdc9f05
1 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
asoc/codecs/wcd934x/wcd934x.c
View file

@ -9977,6 +9977,12 @@ static int tavil_device_down(struct wcd9xxx *wcd9xxx)
int ret;
codec = (struct snd_soc_codec *)(wcd9xxx->ssr_priv);
if (!codec->component.card) {
dev_err(codec->dev, "%s: sound card is not enumerated.\n",
__func__);
return -EINVAL;
}
priv = snd_soc_codec_get_drvdata(codec);
for (count = 0; count < NUM_CODEC_DAIS; count++)
priv->dai[count].bus_down_in_recovery = true;
@ -10027,6 +10033,11 @@ static int tavil_post_reset_cb(struct wcd9xxx *wcd9xxx)
struct wcd_mbhc *mbhc;
codec = (struct snd_soc_codec *)(wcd9xxx->ssr_priv);
if (!codec->component.card) {
dev_err(codec->dev, "%s: sound card is not enumerated.\n",
__func__);
return -EINVAL;
}
tavil = snd_soc_codec_get_drvdata(codec);
control = dev_get_drvdata(codec->dev->parent);