summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2010-10-12 11:40:14 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-10-12 11:02:54 +0100
commit75eda968e4db79bda95e9a5f90aead952c273839 (patch)
tree1b65ed170837dcaace36dbe49a1735bc0db4f093
parenta68a3b4ed4ecafcf80f4272e8e1f0670b387041e (diff)
downloadlinux-stable-75eda968e4db79bda95e9a5f90aead952c273839.tar.gz
linux-stable-75eda968e4db79bda95e9a5f90aead952c273839.tar.bz2
linux-stable-75eda968e4db79bda95e9a5f90aead952c273839.zip
ASoC: fsi: avoid un-necessary status read
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/sh/fsi.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index d68dcbb8dc1f..2b3a50d48ce5 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -572,7 +572,6 @@ static int fsi_fifo_data_ctrl(struct fsi_priv *fsi, int startup, int is_play)
{
struct snd_pcm_runtime *runtime;
struct snd_pcm_substream *substream = NULL;
- u32 status;
u32 status_reg = is_play ? DOFF_ST : DIFF_ST;
int data_residue_num;
int data_num;
@@ -662,9 +661,9 @@ static int fsi_fifo_data_ctrl(struct fsi_priv *fsi, int startup, int is_play)
fsi->buff_offset += fsi_num2offset(data_num, ch_width);
/* check fifo status */
- status = fsi_reg_read(fsi, status_reg);
if (!startup) {
struct snd_soc_dai *dai = fsi_get_dai(substream);
+ u32 status = fsi_reg_read(fsi, status_reg);
if (status & ERR_OVER)
dev_err(dai->dev, "over run\n");