From 6e84da69cf4d2b5d52987071652d741e555a2e74 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Fri, 22 Mar 2013 14:12:04 +0100 Subject: [PATCH] --- yaml --- r: 371899 b: refs/heads/master c: 3021bd38ed31380df5e270451162feca83aef40f h: refs/heads/master i: 371897: 573846976e21dc2a5136bedae24aa73dc4e06d27 371895: 5c403607b9bc5438d69dab665027911451bf6038 v: v3 --- [refs] | 2 +- trunk/sound/soc/tegra/tegra_pcm.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 55c98c676a0a..c85be63d9091 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 340af748bc4004982a1a11ea2d81a4bffe6eb975 +refs/heads/master: 3021bd38ed31380df5e270451162feca83aef40f diff --git a/trunk/sound/soc/tegra/tegra_pcm.c b/trunk/sound/soc/tegra/tegra_pcm.c index c925ab0adeb6..e67af0b5d35d 100644 --- a/trunk/sound/soc/tegra/tegra_pcm.c +++ b/trunk/sound/soc/tegra/tegra_pcm.c @@ -75,12 +75,6 @@ static int tegra_pcm_open(struct snd_pcm_substream *substream) return 0; } -static int tegra_pcm_close(struct snd_pcm_substream *substream) -{ - snd_dmaengine_pcm_close(substream); - return 0; -} - static int tegra_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { @@ -160,7 +154,7 @@ static int tegra_pcm_mmap(struct snd_pcm_substream *substream, static struct snd_pcm_ops tegra_pcm_ops = { .open = tegra_pcm_open, - .close = tegra_pcm_close, + .close = snd_dmaengine_pcm_close, .ioctl = snd_pcm_lib_ioctl, .hw_params = tegra_pcm_hw_params, .hw_free = tegra_pcm_hw_free,