Merge branch 'fix/asoc' into for-linus

* fix/asoc: ASoC: Fix NULL pointer dereference in __pxa2xx_pcm_hw_free
git-mirror · Jul 16, 2009 · 9d5b28d · 9d5b28d
2 parents 6847e15 + b7d4de7
commit 9d5b28d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c
@@ -75,7 +75,7 @@ int __pxa2xx_pcm_hw_free(struct snd_pcm_substream *substream)
 {
 	struct pxa2xx_runtime_data *rtd = substream->runtime->private_data;
 
-	if (rtd && rtd->params)
+	if (rtd && rtd->params && rtd->params->drcmr)
 		*rtd->params->drcmr = 0;
 
 	snd_pcm_set_runtime_buffer(substream, NULL);