diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2021-01-18 17:39:18 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-01-18 17:39:23 +0100 |
| commit | c09e28cd1219fd267ed838e1758ff2e7b6ff3ec6 (patch) | |
| tree | 6259cbb1e1659b2720934409c67e00180ee68ba4 /sound/firewire/tascam | |
| parent | ALSA: x86: Simplify with dma_set_mask_and_coherent() (diff) | |
| parent | ALSA: usb-audio: Avoid implicit feedback on Pioneer devices (diff) | |
| download | linux-dev-c09e28cd1219fd267ed838e1758ff2e7b6ff3ec6.tar.xz linux-dev-c09e28cd1219fd267ed838e1758ff2e7b6ff3ec6.zip | |
Merge branch 'for-linus' into for-next
Back-merge of 5.11 devel branch for more works on USB-audio.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/tascam')
| -rw-r--r-- | sound/firewire/tascam/tascam-transaction.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/firewire/tascam/tascam-transaction.c b/sound/firewire/tascam/tascam-transaction.c index 90288b4b4637..a073cece4a7d 100644 --- a/sound/firewire/tascam/tascam-transaction.c +++ b/sound/firewire/tascam/tascam-transaction.c @@ -209,7 +209,7 @@ static void midi_port_work(struct work_struct *work) /* Set interval to next transaction. */ port->next_ktime = ktime_add_ns(ktime_get(), - port->consume_bytes * 8 * NSEC_PER_SEC / 31250); + port->consume_bytes * 8 * (NSEC_PER_SEC / 31250)); /* Start this transaction. */ port->idling = false; |