Commit ba3b64b9 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.31' into for-2.6.32

parents 47db8e89 b7d4de7f

sound/arm/pxa2xx-pcm-lib.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE