From 8803875aa5722928f9d286010287dba830765923 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Fri, 22 Mar 2013 14:12:08 +0100 Subject: [PATCH] --- yaml --- r: 371903 b: refs/heads/master c: 593b66fbbcac78b73ec17270c874f6db8eabd97c h: refs/heads/master i: 371901: af696813d9fad4d7dbfaf2d9320fb633384fb9fc 371899: 6e84da69cf4d2b5d52987071652d741e555a2e74 371895: 5c403607b9bc5438d69dab665027911451bf6038 371887: aaf567837fea74c7ac3cb0c4f608f7127cea335d 371871: 7a2a3e49995ec1c564f771f47c1f75d888d0f3c4 371839: b3f6dc3da2411754cf60b1415b27ec178e3aff35 v: v3 --- [refs] | 2 +- trunk/sound/soc/spear/spear_pcm.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 5aebf7ef6b83..89e9558b431d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ebd59b07ecd9d35d5bc88c91a4878fbb4549ed42 +refs/heads/master: 593b66fbbcac78b73ec17270c874f6db8eabd97c diff --git a/trunk/sound/soc/spear/spear_pcm.c b/trunk/sound/soc/spear/spear_pcm.c index 32431d619174..db75d72c4805 100644 --- a/trunk/sound/soc/spear/spear_pcm.c +++ b/trunk/sound/soc/spear/spear_pcm.c @@ -64,13 +64,7 @@ static int spear_pcm_open(struct snd_pcm_substream *substream) if (ret) return ret; - ret = snd_dmaengine_pcm_open(substream, dma_data->filter, dma_data); - if (ret) - return ret; - - snd_dmaengine_pcm_set_data(substream, dma_data); - - return 0; + return snd_dmaengine_pcm_open(substream, dma_data->filter, dma_data) } static int spear_pcm_mmap(struct snd_pcm_substream *substream,