From 827e70e9d91fc20aa9f9ec500a9819a1edc48882 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 19 Aug 2009 19:31:46 +0100
Subject: [PATCH] --- yaml --- r: 157678 b: refs/heads/master c:
 f8bae4caaaf56c391f3e2380dd7105e765414178 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/sound/arm/pxa2xx-pcm-lib.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 89cf127e3d1a..39ba4cf25dd8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 474e09ca017bd0f6e9bf41af643364a21bc27f43
+refs/heads/master: f8bae4caaaf56c391f3e2380dd7105e765414178
diff --git a/trunk/sound/arm/pxa2xx-pcm-lib.c b/trunk/sound/arm/pxa2xx-pcm-lib.c
index 6205f37d547c..743ac6a29065 100644
--- a/trunk/sound/arm/pxa2xx-pcm-lib.c
+++ b/trunk/sound/arm/pxa2xx-pcm-lib.c
@@ -136,6 +136,9 @@ int __pxa2xx_pcm_prepare(struct snd_pcm_substream *substream)
 {
 	struct pxa2xx_runtime_data *prtd = substream->runtime->private_data;
 
+	if (!prtd || !prtd->params)
+		return 0;
+
 	DCSR(prtd->dma_ch) &= ~DCSR_RUN;
 	DCSR(prtd->dma_ch) = 0;
 	DCMD(prtd->dma_ch) = 0;