From 24afb6e39004956013dd47d851800e270add1834 Mon Sep 17 00:00:00 2001 From: Karthikeyan Mani Date: Tue, 6 Feb 2018 15:22:37 -0800 Subject: [PATCH] asoc: codecs: add null pointer check for swr control data Null check is needed before accessing swr control data to ensure proper error handling in case speaker path is issued when swr is not enabled. Change-Id: I5037a912652189b3ae58f1119d0534777a9c264a Signed-off-by: Karthikeyan Mani --- asoc/codecs/wcd934x/wcd934x.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/asoc/codecs/wcd934x/wcd934x.c b/asoc/codecs/wcd934x/wcd934x.c index 21c7f12e70..54d07513f6 100644 --- a/asoc/codecs/wcd934x/wcd934x.c +++ b/asoc/codecs/wcd934x/wcd934x.c @@ -2957,6 +2957,11 @@ static int __tavil_codec_enable_swr(struct snd_soc_dapm_widget *w, int event) tavil = snd_soc_codec_get_drvdata(codec); + if (!tavil->swr.ctrl_data) + return -EINVAL; + if (!tavil->swr.ctrl_data[0].swr_pdev) + return -EINVAL; + switch (event) { case SND_SOC_DAPM_PRE_PMU: if (((strnstr(w->name, "INT7_", sizeof("RX INT7_"))) ||