Merge branch 'for-2.6.31' into for-2.6.32

git-mirror · Jul 13, 2009 · ba3b64b · ba3b64b
2 parents 47db8e8 + b7d4de7
commit ba3b64b
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);