Skip to content

Commit

Permalink
ASoC: sti: minor corrections for uniplayer
Browse files Browse the repository at this point in the history
Minor corrections after code review.

Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@st.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Arnaud Pouliquen authored and Mark Brown committed Jul 16, 2015
1 parent 76c2145 commit ed6c75f
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions sound/soc/sti/uniperif_player.c
Original file line number Diff line number Diff line change
Expand Up @@ -475,16 +475,19 @@ 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;

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,
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit ed6c75f

Please sign in to comment.