| From 9b371c6cc37f954360989eec41c2ddc5a6b83917 Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <johan@kernel.org> |
| Date: Mon, 25 Oct 2021 14:11:41 +0200 |
| Subject: ALSA: 6fire: fix control and bulk message timeouts |
| |
| From: Johan Hovold <johan@kernel.org> |
| |
| commit 9b371c6cc37f954360989eec41c2ddc5a6b83917 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| sound/usb/6fire/comm.c | 2 +- |
| sound/usb/6fire/firmware.c | 6 +++--- |
| 2 files changed, 4 insertions(+), 4 deletions(-) |
| |
| --- a/sound/usb/6fire/comm.c |
| +++ b/sound/usb/6fire/comm.c |
| @@ -95,7 +95,7 @@ static int usb6fire_comm_send_buffer(u8 |
| 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) |
| --- a/sound/usb/6fire/firmware.c |
| +++ b/sound/usb/6fire/firmware.c |
| @@ -162,7 +162,7 @@ static int usb6fire_fw_ezusb_write(struc |
| |
| ret = usb_control_msg(device, usb_sndctrlpipe(device, 0), type, |
| USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, |
| - value, 0, data, len, HZ); |
| + value, 0, data, len, 1000); |
| if (ret < 0) |
| return ret; |
| else if (ret != len) |
| @@ -175,7 +175,7 @@ static int usb6fire_fw_ezusb_read(struct |
| { |
| int ret = usb_control_msg(device, usb_rcvctrlpipe(device, 0), type, |
| USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, value, |
| - 0, data, len, HZ); |
| + 0, data, len, 1000); |
| if (ret < 0) |
| return ret; |
| else if (ret != len) |
| @@ -190,7 +190,7 @@ static int usb6fire_fw_fpga_write(struct |
| int ret; |
| |
| ret = usb_bulk_msg(device, usb_sndbulkpipe(device, FPGA_EP), data, len, |
| - &actual_len, HZ); |
| + &actual_len, 1000); |
| if (ret < 0) |
| return ret; |
| else if (actual_len != len) |
