diff options
author | Takashi Iwai <tiwai@suse.de> | 2021-02-15 11:06:39 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2021-02-15 11:07:01 +0300 |
commit | de1528ee7cb7c161444dadbc971d050bebb5cbe7 (patch) | |
tree | a1f53cd279966802de097c0f0f6625b49e6903f1 /sound/pci/cs46xx/cs46xx_lib.c | |
parent | 0d3070f5e6551d8a759619e85736e49a3bf40398 (diff) | |
parent | 15447b64789d9ade71eb374d5ae1f37d0bbce0bd (diff) | |
download | linux-de1528ee7cb7c161444dadbc971d050bebb5cbe7.tar.xz |
Merge branch 'for-next' into for-linus
Unification of 5.12-devel branches.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/cs46xx/cs46xx_lib.c')
-rw-r--r-- | sound/pci/cs46xx/cs46xx_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c index 4490dd7469d9..37f516e6a5c2 100644 --- a/sound/pci/cs46xx/cs46xx_lib.c +++ b/sound/pci/cs46xx/cs46xx_lib.c @@ -813,7 +813,7 @@ static void snd_cs46xx_set_capture_sample_rate(struct snd_cs46xx *chip, unsigned correctionPerGOF = tmp1 / GOF_PER_SEC; tmp1 -= correctionPerGOF * GOF_PER_SEC; correctionPerSec = tmp1; - initialDelay = ((48000 * 24) + rate - 1) / rate; + initialDelay = DIV_ROUND_UP(48000 * 24, rate); /* * Fill in the VariDecimate control block. |