diff options
| author | Mark Brown <broonie@kernel.org> | 2021-04-23 19:01:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-04-23 19:01:02 +0100 |
| commit | ffc9841d5200a484ea0ecc645157b4d7b873f3a6 (patch) | |
| tree | c5216df939963608cefcd94bdf2934a2b880b54d /sound/soc/codecs/rt1308.c | |
| parent | d143a69fd452a047440391fcbe290ff416b14ab5 (diff) | |
| parent | 25c4a9b614f101bb9f3e687960815db7dc439c0f (diff) | |
| download | linux-ffc9841d5200a484ea0ecc645157b4d7b873f3a6.tar.bz2 | |
Merge remote-tracking branch 'asoc/for-5.13' into asoc-next
Diffstat (limited to 'sound/soc/codecs/rt1308.c')
| -rw-r--r-- | sound/soc/codecs/rt1308.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/codecs/rt1308.c b/sound/soc/codecs/rt1308.c index b75931a69a1c..b4e5546e2e21 100644 --- a/sound/soc/codecs/rt1308.c +++ b/sound/soc/codecs/rt1308.c @@ -673,10 +673,10 @@ static int rt1308_set_component_pll(struct snd_soc_component *component, pll_code.n_code, pll_code.k_code); snd_soc_component_write(component, RT1308_PLL_1, - pll_code.k_code << RT1308_PLL1_K_SFT | - pll_code.m_bp << RT1308_PLL1_M_BYPASS_SFT | - (pll_code.m_bp ? 0 : pll_code.m_code) << RT1308_PLL1_M_SFT | - pll_code.n_code << RT1308_PLL1_N_SFT); + (pll_code.k_code << RT1308_PLL1_K_SFT) | + (pll_code.m_bp << RT1308_PLL1_M_BYPASS_SFT) | + ((pll_code.m_bp ? 0 : pll_code.m_code) << RT1308_PLL1_M_SFT) | + (pll_code.n_code << RT1308_PLL1_N_SFT)); rt1308->pll_in = freq_in; rt1308->pll_out = freq_out; @@ -790,7 +790,7 @@ MODULE_DEVICE_TABLE(of, rt1308_of_match); #endif #ifdef CONFIG_ACPI -static struct acpi_device_id rt1308_acpi_match[] = { +static const struct acpi_device_id rt1308_acpi_match[] = { { "10EC1308", 0, }, { }, }; |