summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-07-16 16:35:46 +0200
committerTakashi Iwai <tiwai@suse.de>2009-07-16 16:35:46 +0200
commit9d5b28d530000aa5a256046f0dd42a3787687cc9 (patch)
treee17c9965b731e1fb76f8301354c8f54201b11a55 /sound
parent6847e154e3cd74fca6084124c097980a7634285a (diff)
parentb7d4de7ff03085fda8310b2983b907166dd40f43 (diff)
Merge branch 'fix/asoc' into for-linus
* fix/asoc: ASoC: Fix NULL pointer dereference in __pxa2xx_pcm_hw_free
Diffstat (limited to 'sound')
-rw-r--r--sound/arm/pxa2xx-pcm-lib.c2
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);