diff options
| author | Johan Hovold <johan@kernel.org> | 2021-10-25 14:11:41 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-10-26 08:12:02 +0200 |
| commit | 9b371c6cc37f954360989eec41c2ddc5a6b83917 (patch) | |
| tree | a6b7c627ece208d77c3fa0ba10870f0a94282501 /sound/usb/6fire/comm.c | |
| parent | ALSA: usb-audio: fix null pointer dereference on pointer cs_desc (diff) | |
| download | linux-9b371c6cc37f954360989eec41c2ddc5a6b83917.tar.xz linux-9b371c6cc37f954360989eec41c2ddc5a6b83917.zip | |
ALSA: 6fire: fix control and bulk message timeouts
USB control and bulk message timeouts are specified in milliseconds and
should specifically not vary with CONFIG_HZ.
Fixes: c6d43ba816d1 ("ALSA: usb/6fire - Driver for TerraTec DMX 6Fire USB")
Cc: stable@vger.kernel.org # 2.6.39
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20211025121142.6531-2-johan@kernel.org
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/6fire/comm.c')
| -rw-r--r-- | sound/usb/6fire/comm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/6fire/comm.c b/sound/usb/6fire/comm.c index 43a2a62d66f7..49629d4bb327 100644 --- a/sound/usb/6fire/comm.c +++ b/sound/usb/6fire/comm.c @@ -95,7 +95,7 @@ static int usb6fire_comm_send_buffer(u8 *buffer, struct usb_device *dev) int actual_len; ret = usb_interrupt_msg(dev, usb_sndintpipe(dev, COMM_EP), - buffer, buffer[1] + 2, &actual_len, HZ); + buffer, buffer[1] + 2, &actual_len, 1000); if (ret < 0) return ret; else if (actual_len != buffer[1] + 2) |