From 6adc1099b3152f0c74f77b202c41fa0c35fa7352 Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Thu, 9 Jun 2011 17:04:59 +0100 Subject: [PATCH] --- yaml --- r: 257525 b: refs/heads/master c: 91d5e6b4f5900cb46f92cd98d561a1a54bbca6b6 h: refs/heads/master i: 257523: c86c005245fdfca962863a0bcabd1ccf2d6e2cf4 v: v3 --- [refs] | 2 +- trunk/sound/soc/soc-pcm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index acb2e2379dfc..25c920e4d79a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8c0dab9bf3373010e857a8d3f1b594c60a348dd +refs/heads/master: 91d5e6b4f5900cb46f92cd98d561a1a54bbca6b6 diff --git a/trunk/sound/soc/soc-pcm.c b/trunk/sound/soc/soc-pcm.c index f4864b088d2c..b5759397afa3 100644 --- a/trunk/sound/soc/soc-pcm.c +++ b/trunk/sound/soc/soc-pcm.c @@ -268,7 +268,7 @@ static void close_delayed_work(struct work_struct *work) * freed here. The cpu DAI, codec DAI, machine and platform are also * shutdown. */ -static int soc_codec_close(struct snd_pcm_substream *substream) +static int soc_pcm_close(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_platform *platform = rtd->platform; @@ -567,7 +567,7 @@ static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream) /* ASoC PCM operations */ static struct snd_pcm_ops soc_pcm_ops = { .open = soc_pcm_open, - .close = soc_codec_close, + .close = soc_pcm_close, .hw_params = soc_pcm_hw_params, .hw_free = soc_pcm_hw_free, .prepare = soc_pcm_prepare,