diff options
| -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 4d041d376f31..a3fb41179636 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, | |||
| 1604 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 1604 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
| 1605 | struct snd_soc_codec *codec = rtd->codec; | 1605 | struct snd_soc_codec *codec = rtd->codec; |
| 1606 | struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); | 1606 | struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); |
| 1607 | unsigned int val_len = 0, val_clk, mask_clk, dai_sel; | 1607 | unsigned int val_len = 0, val_clk, mask_clk; |
| 1608 | int pre_div, bclk_ms, frame_size; | 1608 | int dai_sel, pre_div, bclk_ms, frame_size; |
| 1609 | 1609 | ||
| 1610 | rt5640->lrck[dai->id] = params_rate(params); | 1610 | rt5640->lrck[dai->id] = params_rate(params); |
| 1611 | pre_div = get_clk_info(rt5640->sysclk, rt5640->lrck[dai->id]); | 1611 | 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) | |||
| 1675 | { | 1675 | { |
| 1676 | struct snd_soc_codec *codec = dai->codec; | 1676 | struct snd_soc_codec *codec = dai->codec; |
| 1677 | struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); | 1677 | struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); |
| 1678 | unsigned int reg_val = 0, dai_sel; | 1678 | unsigned int reg_val = 0; |
| 1679 | int dai_sel; | ||
| 1679 | 1680 | ||
| 1680 | switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { | 1681 | switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { |
| 1681 | case SND_SOC_DAIFMT_CBM_CFM: | 1682 | case SND_SOC_DAIFMT_CBM_CFM: |
