Merge "ASoC: wcd934x: add null check for soundwire control data"

This commit is contained in:
Linux Build Service Account 2017-04-05 20:21:27 -07:00 committed by Gerrit - the friendly Code Review server
commit 2e1b1eb1e5

View file

@ -9076,8 +9076,9 @@ static int tavil_device_down(struct wcd9xxx *wcd9xxx)
codec = (struct snd_soc_codec *)(wcd9xxx->ssr_priv);
priv = snd_soc_codec_get_drvdata(codec);
swrm_wcd_notify(priv->swr.ctrl_data[0].swr_pdev,
SWR_DEVICE_DOWN, NULL);
if (priv->swr.ctrl_data)
swrm_wcd_notify(priv->swr.ctrl_data[0].swr_pdev,
SWR_DEVICE_DOWN, NULL);
tavil_dsd_reset(priv->dsd_config);
snd_soc_card_change_online_state(codec->component.card, 0);
for (count = 0; count < NUM_CODEC_DAIS; count++)