Merge branch 'for-2.6.31' into for-2.6.32

This commit is contained in:
Mark Brown 2009-07-13 23:05:51 +01:00
commit ba3b64b976

View file

@ -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);