From af696813d9fad4d7dbfaf2d9320fb633384fb9fc Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Fri, 22 Mar 2013 14:12:06 +0100 Subject: [PATCH] --- yaml --- r: 371901 b: refs/heads/master c: a85fc1b073406b3848661fcbb452497930dcc8af h: refs/heads/master i: 371899: 6e84da69cf4d2b5d52987071652d741e555a2e74 v: v3 --- [refs] | 2 +- trunk/sound/soc/atmel/atmel-pcm-dma.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 061ec2c6e9da..0c83b9d54a22 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c4e56fd5595105128077c2bbdfde3c15a4c2d91 +refs/heads/master: a85fc1b073406b3848661fcbb452497930dcc8af diff --git a/trunk/sound/soc/atmel/atmel-pcm-dma.c b/trunk/sound/soc/atmel/atmel-pcm-dma.c index 30184a4a147a..396bf78c7a2d 100644 --- a/trunk/sound/soc/atmel/atmel-pcm-dma.c +++ b/trunk/sound/soc/atmel/atmel-pcm-dma.c @@ -199,16 +199,9 @@ static int atmel_pcm_open(struct snd_pcm_substream *substream) return 0; } -static int atmel_pcm_close(struct snd_pcm_substream *substream) -{ - snd_dmaengine_pcm_close(substream); - - return 0; -} - static struct snd_pcm_ops atmel_pcm_ops = { .open = atmel_pcm_open, - .close = atmel_pcm_close, + .close = snd_dmaengine_pcm_close, .ioctl = snd_pcm_lib_ioctl, .hw_params = atmel_pcm_hw_params, .prepare = atmel_pcm_dma_prepare,