Skip to content

L
linux-davinci
Commit ba3b64b9 authored by Mark Brown's avatar Mark Brown
Browse files
Options

Merge branch 'for-2.6.31' into for-2.6.32

parents 47db8e89 b7d4de7f
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
sound/arm/pxa2xx-pcm-lib.c
View file @ ba3b64b9
...@@ -75,7 +75,7 @@ int __pxa2xx_pcm_hw_free(struct snd_pcm_substream *substream) ...@@ -75,7 +75,7 @@ int __pxa2xx_pcm_hw_free(struct snd_pcm_substream *substream)
{ {
struct pxa2xx_runtime_data *rtd = substream->runtime->private_data; struct pxa2xx_runtime_data *rtd = substream->runtime->private_data;
if (rtd && rtd->params) if (rtd && rtd->params && rtd->params->drcmr)
*rtd->params->drcmr = 0; *rtd->params->drcmr = 0;
snd_pcm_set_runtime_buffer(substream, NULL); snd_pcm_set_runtime_buffer(substream, NULL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment