diff options
| author | Arnaud Pouliquen <arnaud.pouliquen@st.com> | 2015-07-16 11:36:02 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-07-16 21:38:23 +0100 |
| commit | ed6c75f23383ba4e0fbc935c0b6ab165bc9ff65e (patch) | |
| tree | 7d63d8848e14a6313fbe44e6a1bb9111267c717e /sound/soc/sti | |
| parent | 76c2145ded6b83488dec4afc46a29a57cee90552 (diff) | |
| download | linux-ed6c75f23383ba4e0fbc935c0b6ab165bc9ff65e.tar.bz2 | |
ASoC: sti: minor corrections for uniplayer
Minor corrections after code review.
Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@st.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sti')
| -rw-r--r-- | sound/soc/sti/uniperif_player.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sound/soc/sti/uniperif_player.c b/sound/soc/sti/uniperif_player.c index d66d633f0b29..d12d0502545e 100644 --- a/sound/soc/sti/uniperif_player.c +++ b/sound/soc/sti/uniperif_player.c @@ -475,6 +475,7 @@ static int uni_player_set_sysclk(struct snd_soc_dai *dai, int clk_id, { struct sti_uniperiph_data *priv = snd_soc_dai_get_drvdata(dai); struct uniperif *player = priv->dai_data.uni; + int ret; if (dir == SND_SOC_CLOCK_IN) return 0; @@ -482,9 +483,11 @@ static int uni_player_set_sysclk(struct snd_soc_dai *dai, int clk_id, if (clk_id != 0) return -EINVAL; - player->mclk = freq; + ret = clk_set_rate(player->clk, freq); + if (!ret) + player->mclk = freq; - return clk_set_rate(player->clk, freq); + return ret; } static int uni_player_prepare(struct snd_pcm_substream *substream, @@ -562,6 +565,7 @@ static int uni_player_prepare(struct snd_pcm_substream *substream, case SND_SOC_DAIFMT_IB_IF: SET_UNIPERIF_I2S_FMT_LR_POL_HIG(player); SET_UNIPERIF_I2S_FMT_SCLK_EDGE_FALLING(player); + break; } switch (player->daifmt & SND_SOC_DAIFMT_FORMAT_MASK) { @@ -840,7 +844,7 @@ int uni_player_init(struct platform_device *pdev, /* Get uniperif resource */ player->clk = of_clk_get(pdev->dev.of_node, 0); if (IS_ERR(player->clk)) - ret = (int)PTR_ERR(player->clk); + ret = PTR_ERR(player->clk); /* Select the frequency synthesizer clock */ if (player->clk_sel) { |