summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorLiam Girdwood <lrg@ti.com>2012-01-16 15:23:31 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-16 15:49:09 +0000
commite7c80e2a8b403c10d805f48596efac741cce754d (patch)
treedf84341aaf1fe912449a9f85ff8a731b34225360 /sound
parentf7cb8a4be1cb46b03ccf517d505b3474c810853d (diff)
downloadlinux-3.10-e7c80e2a8b403c10d805f48596efac741cce754d.tar.gz
linux-3.10-e7c80e2a8b403c10d805f48596efac741cce754d.tar.bz2
linux-3.10-e7c80e2a8b403c10d805f48596efac741cce754d.zip
ASoC: dapm - Fix check for codec context in dapm_power_widgets().
Fixes a NULL pointer dereference in dapm_power_widgets() if the dapm context has no codec. Signed-off-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-dapm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 3ad1f59b802..1f55ded4047 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -1426,7 +1426,7 @@ static int dapm_power_widgets(struct snd_soc_dapm_context *dapm, int event)
dapm->target_bias_level = SND_SOC_BIAS_ON;
break;
case SND_SOC_DAPM_STREAM_STOP:
- if (dapm->codec->active)
+ if (dapm->codec && dapm->codec->active)
dapm->target_bias_level = SND_SOC_BIAS_ON;
else
dapm->target_bias_level = SND_SOC_BIAS_STANDBY;