From: Mark Brown <broonie@kernel.org>
Date: Mon, 21 Sep 2020 21:37:14 +0000 (+0100)
Subject: Merge branch 'asoc-5.9' into asoc-5.10
X-Git-Tag: io_uring-5.10-2020-10-20~47^2~1^2^2~76
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=97ee967e6c56db6eb5ed5951276b9a6db04c6489;p=linux-block.git

Merge branch 'asoc-5.9' into asoc-5.10
---

97ee967e6c56db6eb5ed5951276b9a6db04c6489
diff --cc sound/soc/codecs/tlv320aic32x4.c
index 470dc0ef0359,ea8cd4487536..9e3de9ded0ef
--- a/sound/soc/codecs/tlv320aic32x4.c
+++ b/sound/soc/codecs/tlv320aic32x4.c
@@@ -688,8 -665,7 +688,8 @@@ static int aic32x4_set_processing_block
  }
  
  static int aic32x4_setup_clocks(struct snd_soc_component *component,
- 				unsigned int sample_rate, unsigned int channel,
 -				unsigned int sample_rate, unsigned int channels)
++				unsigned int sample_rate, unsigned int channels,
 +				unsigned int bit_depth)
  {
  	u8 aosr;
  	u16 dosr;
@@@ -777,8 -753,9 +777,9 @@@
  							dosr);
  
  						clk_set_rate(clocks[5].clk,
- 							sample_rate * channel *
 -							sample_rate * 32 *
 -							channels);
++							sample_rate * channels *
 +							bit_depth);
+ 
  						return 0;
  					}
  				}