ALSA: 6fire: fix control and bulk message timeouts

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>

diff --git a/sound/usb/6fire/comm.c b/sound/usb/6fire/comm.c
index 161215d78d9520a98026574489095b47e6c95f85..f29c115b9d5649057ed629bc144710de393e0924 100644 (file)
--- a/sound/usb/6fire/comm.c
+++ b/sound/usb/6fire/comm.c
@@ -99,7 +99,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 62c25e74f0e52542b06acd2f57e47164d408d56d..2809ba257fa4ee36dc70af9562b8112cc8125359 100644 (file)
--- a/sound/usb/6fire/firmware.c
+++ b/sound/usb/6fire/firmware.c
@@ -166,7 +166,7 @@ static int usb6fire_fw_ezusb_write(struct usb_device *device,
 
        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)
@@ -179,7 +179,7 @@ static int usb6fire_fw_ezusb_read(struct usb_device *device,
 {
        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)
@@ -194,7 +194,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)