diff options
| author | Mark Brown <broonie@kernel.org> | 2019-09-09 14:55:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-09 14:55:20 +0100 |
| commit | bb831786117519fc16dfd3eaa7b84e4f6bbb8d99 (patch) | |
| tree | 18f8333bbaf6918a0246113eeb0f056011e436f2 /sound/soc/codecs/wm8955.c | |
| parent | 6652ddbb5d83ecfc2591b92be063519714e40ebf (diff) | |
| parent | 6fa5963c37a2e3335eba0b7455e35a01318ebc15 (diff) | |
| download | talos-op-linux-bb831786117519fc16dfd3eaa7b84e4f6bbb8d99.tar.gz talos-op-linux-bb831786117519fc16dfd3eaa7b84e4f6bbb8d99.zip | |
Merge branch 'asoc-5.4' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm8955.c')
| -rw-r--r-- | sound/soc/codecs/wm8955.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c index 66a5f1827aa9..9c7e2892c8cb 100644 --- a/sound/soc/codecs/wm8955.c +++ b/sound/soc/codecs/wm8955.c @@ -140,7 +140,7 @@ struct pll_factors { * to allow rounding later */ #define FIXED_FLL_SIZE ((1 << 22) * 10) -static int wm8995_pll_factors(struct device *dev, +static int wm8955_pll_factors(struct device *dev, int Fref, int Fout, struct pll_factors *pll) { u64 Kpart; @@ -279,7 +279,7 @@ static int wm8955_configure_clocking(struct snd_soc_component *component) /* Use the last divider configuration we saw for the * sample rate. */ - ret = wm8995_pll_factors(component->dev, wm8955->mclk_rate, + ret = wm8955_pll_factors(component->dev, wm8955->mclk_rate, clock_cfgs[sr].mclk, &pll); if (ret != 0) { dev_err(component->dev, |
