ALSA: 6fire: fix control and bulk message timeouts

BugLink: https://bugs.launchpad.net/bugs/1951822
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>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/sound/usb/6fire/comm.c b/sound/usb/6fire/comm.c
index 43a2a62d66f7ea8b11e4ee67a23115c21939da35..49629d4bb327aed41f566079d328d865774207ea 100644 (file)
--- 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)

diff --git a/sound/usb/6fire/firmware.c b/sound/usb/6fire/firmware.c
index 8981e61f2da4a5dc7c7a9458f1fcffa515c8c1b5..c51abc54d2f844f515aecb0a6bed16a9eba58aba 100644 (file)
--- a/sound/usb/6fire/firmware.c
+++ b/sound/usb/6fire/firmware.c
@@ -160,7 +160,7 @@ static int usb6fire_fw_ezusb_write(struct usb_device *device,
 {
        return usb_control_msg_send(device, 0, type,
                                    USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                                   value, 0, data, len, HZ, GFP_KERNEL);
+                                   value, 0, data, len, 1000, GFP_KERNEL);
 }
 
 static int usb6fire_fw_ezusb_read(struct usb_device *device,
@@ -168,7 +168,7 @@ static int usb6fire_fw_ezusb_read(struct usb_device *device,
 {
        return usb_control_msg_recv(device, 0, type,
                                    USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                                   value, 0, data, len, HZ, GFP_KERNEL);
+                                   value, 0, data, len, 1000, GFP_KERNEL);
 }
 
 static int usb6fire_fw_fpga_write(struct usb_device *device,
@@ -178,7 +178,7 @@ static int usb6fire_fw_fpga_write(struct usb_device *device,
        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)