From 351dfeb90c3f5a34605a6a56281cac1017a3830e Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Tue, 18 Sep 2012 17:20:05 +0800 Subject: [PATCH] --- yaml --- r: 332109 b: refs/heads/master c: d37777a13b4c4b32e274013846d739e5bbbf6f8d h: refs/heads/master i: 332107: 1196e470644f006ae6679b89e4737d3e39db593d v: v3 --- [refs] | 2 +- trunk/sound/soc/fsl/imx-pcm-dma.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 84e6c473ead5..4c955c134803 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86767b7d5b3cdbd105e7d7066d671b52aa208188 +refs/heads/master: d37777a13b4c4b32e274013846d739e5bbbf6f8d diff --git a/trunk/sound/soc/fsl/imx-pcm-dma.c b/trunk/sound/soc/fsl/imx-pcm-dma.c index 48f9d886f020..a23505a9ae64 100644 --- a/trunk/sound/soc/fsl/imx-pcm-dma.c +++ b/trunk/sound/soc/fsl/imx-pcm-dma.c @@ -109,6 +109,9 @@ static int snd_imx_open(struct snd_pcm_substream *substream) dma_params = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream); dma_data = kzalloc(sizeof(*dma_data), GFP_KERNEL); + if (!dma_data) + return -ENOMEM; + dma_data->peripheral_type = dma_params->shared_peripheral ? IMX_DMATYPE_SSI_SP : IMX_DMATYPE_SSI; dma_data->priority = DMA_PRIO_HIGH;