Merge branch 'drm-next-4.2' of git://people.freedesktop.org/~agd5f/linux

[cascardo/linux.git] / sound / soc / fsl / fsl_spdif.c

diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c
index 91eb3ae..8e93221 100644 (file)
--- a/sound/soc/fsl/fsl_spdif.c
+++ b/sound/soc/fsl/fsl_spdif.c
@@ -417,11 +417,9 @@ static int spdif_set_sample_rate(struct snd_pcm_substream *substream,
        if (clk != STC_TXCLK_SPDIF_ROOT)
                goto clk_set_bypass;
 
-       /*
-        * The S/PDIF block needs a clock of 64 * fs * txclk_df.
-        * So request 64 * fs * (txclk_df + 1) to get rounded.
-        */
-       ret = clk_set_rate(spdif_priv->txclk[rate], 64 * sample_rate * (txclk_df + 1));
+       /* The S/PDIF block needs a clock of 64 * fs * txclk_df */
+       ret = clk_set_rate(spdif_priv->txclk[rate],
+                          64 * sample_rate * txclk_df);
        if (ret) {
                dev_err(&pdev->dev, "failed to set tx clock rate\n");
                return ret;
@@ -1060,7 +1058,7 @@ static u32 fsl_spdif_txclk_caldiv(struct fsl_spdif_priv *spdif_priv,
 
        for (sysclk_df = sysclk_dfmin; sysclk_df <= sysclk_dfmax; sysclk_df++) {
                for (txclk_df = 1; txclk_df <= 128; txclk_df++) {
-                       rate_ideal = rate[index] * (txclk_df + 1) * 64;
+                       rate_ideal = rate[index] * txclk_df * 64;
                        if (round)
                                rate_actual = clk_round_rate(clk, rate_ideal);
                        else