diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-04-05 20:21:27 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-05 20:21:27 -0700 |
| commit | 2e1b1eb1e5d306c0ea487e30201fbb616aadebe3 (patch) | |
| tree | f59a2d5312856e2c740b4e4484851d93484ec389 | |
| parent | ad7c7b10d1db4ce8cfb3585d3e9dfce683002cd0 (diff) | |
| parent | e06bfb9b82a14f5ba79a352de828ad66773a2a4f (diff) | |
Merge "ASoC: wcd934x: add null check for soundwire control data"
| -rw-r--r-- | sound/soc/codecs/wcd934x/wcd934x.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/codecs/wcd934x/wcd934x.c b/sound/soc/codecs/wcd934x/wcd934x.c index cc8e45d77fcd..e125ed8c2a16 100644 --- a/sound/soc/codecs/wcd934x/wcd934x.c +++ b/sound/soc/codecs/wcd934x/wcd934x.c @@ -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++) |