diff options
author | Mark Brown <broonie@kernel.org> | 2017-02-19 11:35:47 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-02-19 11:35:47 -0500 |
commit | 715d525b413cde6e86caf0a744287d7b71395d1e (patch) | |
tree | c9f1ee401bcf55741d8565af6f5f98e809b75581 | |
parent | 16b5711485b0eba250451b3a85ab869939f20c7d (diff) | |
parent | fc25914631d623880b5fc3abf067bcb3e8c6b4d4 (diff) |
Merge remote-tracking branch 'asoc/topic/pcm3168a' into asoc-next
-rw-r--r-- | sound/soc/codecs/pcm3168a.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/codecs/pcm3168a.c b/sound/soc/codecs/pcm3168a.c index 39bc02d5bc5d..b9d1207ccef2 100644 --- a/sound/soc/codecs/pcm3168a.c +++ b/sound/soc/codecs/pcm3168a.c | |||
@@ -402,10 +402,8 @@ static int pcm3168a_hw_params(struct snd_pcm_substream *substream, | |||
402 | u32 val, mask, shift, reg; | 402 | u32 val, mask, shift, reg; |
403 | unsigned int rate, fmt, ratio, max_ratio; | 403 | unsigned int rate, fmt, ratio, max_ratio; |
404 | int i, min_frame_size; | 404 | int i, min_frame_size; |
405 | snd_pcm_format_t format; | ||
406 | 405 | ||
407 | rate = params_rate(params); | 406 | rate = params_rate(params); |
408 | format = params_format(params); | ||
409 | 407 | ||
410 | ratio = pcm3168a->sysclk / rate; | 408 | ratio = pcm3168a->sysclk / rate; |
411 | 409 | ||