Merge branch 'for-2.6.31' into for-2.6.32

ba3b64b9 · Mark Brown · 47db8e89 · b7d4de7f · ba3b64b9
Commit ba3b64b9 authored Jul 13, 2009 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/arm/pxa2xx-pcm-lib.c sound/arm/pxa2xx-pcm-lib.c +1 -1

No files found.
--- 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);