diff options
| author | Mark Brown <broonie@kernel.org> | 2016-01-05 18:07:32 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-01-05 18:07:32 -0500 |
| commit | 7a78d9439ae9515a8ed2b97c267e54da92f2def0 (patch) | |
| tree | 58c582a5f9207da7e842dc08b11955bfd8bf841b | |
| parent | 168309855a7d1e16db751e9c647119fe2d2dc878 (diff) | |
| parent | e73694d871867cae8471d2350ce89acb38bc2b63 (diff) | |
Merge remote-tracking branch 'asoc/fix/arizona' into asoc-linus
| -rw-r--r-- | sound/soc/codecs/arizona.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index b3ea24d64c50..93b400800905 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c | |||
| @@ -1537,7 +1537,7 @@ static int arizona_hw_params(struct snd_pcm_substream *substream, | |||
| 1537 | bool reconfig; | 1537 | bool reconfig; |
| 1538 | unsigned int aif_tx_state, aif_rx_state; | 1538 | unsigned int aif_tx_state, aif_rx_state; |
| 1539 | 1539 | ||
| 1540 | if (params_rate(params) % 8000) | 1540 | if (params_rate(params) % 4000) |
| 1541 | rates = &arizona_44k1_bclk_rates[0]; | 1541 | rates = &arizona_44k1_bclk_rates[0]; |
| 1542 | else | 1542 | else |
| 1543 | rates = &arizona_48k_bclk_rates[0]; | 1543 | rates = &arizona_48k_bclk_rates[0]; |