Merge branch 'for-2.6.31' into for-2.6.32
This commit is contained in:
commit
ba3b64b976
|
@ -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);
|
||||||
|
|
Loading…
Reference in a new issue