From 1c1207c720287e989dfab895ef87e3c448fcfc31 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Sun, 2 Oct 2011 21:05:56 +0800 Subject: [PATCH] --- yaml --- r: 270729 b: refs/heads/master c: c6add3f0e690e156d2e028e34916793497546152 h: refs/heads/master i: 270727: cf1975ae14e954f100e3cdf1c26ec33712612a4e v: v3 --- [refs] | 2 +- trunk/sound/soc/pxa/magician.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bc7b98c54af8..105a6d758970 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8fccf46905b05baa08f69516cabc229ef222f5d7 +refs/heads/master: c6add3f0e690e156d2e028e34916793497546152 diff --git a/trunk/sound/soc/pxa/magician.c b/trunk/sound/soc/pxa/magician.c index 67dcc36cd621..098e5f4b7d41 100644 --- a/trunk/sound/soc/pxa/magician.c +++ b/trunk/sound/soc/pxa/magician.c @@ -92,11 +92,10 @@ static int magician_playback_hw_params(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_dai *codec_dai = rtd->codec_dai; struct snd_soc_dai *cpu_dai = rtd->cpu_dai; - unsigned int acps, acds, width, rate; + unsigned int acps, acds, width; unsigned int div4 = PXA_SSP_CLK_SCDB_4; int ret = 0; - rate = params_rate(params); width = snd_pcm_format_physical_width(params_format(params)); /*