diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-07-13 23:05:51 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-07-13 23:05:51 +0100 |
| commit | ba3b64b976f91067710ef1a87b9b445406910e8f (patch) | |
| tree | 093c27a1949c1616c78db12fc2263c7b4bde5da9 /sound | |
| parent | 47db8e89ac04377fc4de9278d0a3d6e599c04b95 (diff) | |
| parent | b7d4de7ff03085fda8310b2983b907166dd40f43 (diff) | |
Merge branch 'for-2.6.31' into for-2.6.32
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/arm/pxa2xx-pcm-lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c index 108b643229ba..6205f37d547c 100644 --- 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); |