diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-20 15:20:31 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-20 15:20:31 +0000 |
| commit | cde4d7596c838e073ad0f1f9bd04e7ac01778d34 (patch) | |
| tree | ccd4625f03507b02c8ac23bb173249eb4df5a6da /sound/soc/codecs/rt5640.c | |
| parent | 971a6f45e071447975c33d6747f95a1e385d0f45 (diff) | |
| parent | fc7dc61d9a87011aaf8a6eb3144ebf9552adf5d2 (diff) | |
| download | op-kernel-dev-cde4d7596c838e073ad0f1f9bd04e7ac01778d34.zip op-kernel-dev-cde4d7596c838e073ad0f1f9bd04e7ac01778d34.tar.gz | |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
Diffstat (limited to 'sound/soc/codecs/rt5640.c')
| -rw-r--r-- | sound/soc/codecs/rt5640.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index 4d041d3..a3fb411 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -1604,8 +1604,8 @@ static int rt5640_hw_params(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_codec *codec = rtd->codec; struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); - unsigned int val_len = 0, val_clk, mask_clk, dai_sel; - int pre_div, bclk_ms, frame_size; + unsigned int val_len = 0, val_clk, mask_clk; + int dai_sel, pre_div, bclk_ms, frame_size; rt5640->lrck[dai->id] = params_rate(params); pre_div = get_clk_info(rt5640->sysclk, rt5640->lrck[dai->id]); @@ -1675,7 +1675,8 @@ static int rt5640_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) { struct snd_soc_codec *codec = dai->codec; struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); - unsigned int reg_val = 0, dai_sel; + unsigned int reg_val = 0; + int dai_sel; switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { case SND_SOC_DAIFMT_CBM_CFM: |
