diff --git a/[refs] b/[refs] index 0200b0eb9ffe..b4a850087aab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a68a3b4ed4ecafcf80f4272e8e1f0670b387041e +refs/heads/master: 75eda968e4db79bda95e9a5f90aead952c273839 diff --git a/trunk/sound/soc/sh/fsi.c b/trunk/sound/soc/sh/fsi.c index d68dcbb8dc1f..2b3a50d48ce5 100644 --- a/trunk/sound/soc/sh/fsi.c +++ b/trunk/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");