Commit 9b371c6c authored by Johan Hovold's avatar Johan Hovold Committed by Takashi Iwai

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: c6d43ba8 ("ALSA: usb/6fire - Driver for TerraTec DMX 6Fire USB")
Cc: stable@vger.kernel.org      # 2.6.39
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20211025121142.6531-2-johan@kernel.orgSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent b97053df
...@@ -95,7 +95,7 @@ static int usb6fire_comm_send_buffer(u8 *buffer, struct usb_device *dev) ...@@ -95,7 +95,7 @@ static int usb6fire_comm_send_buffer(u8 *buffer, struct usb_device *dev)
int actual_len; int actual_len;
ret = usb_interrupt_msg(dev, usb_sndintpipe(dev, COMM_EP), 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) if (ret < 0)
return ret; return ret;
else if (actual_len != buffer[1] + 2) else if (actual_len != buffer[1] + 2)
......
...@@ -160,7 +160,7 @@ static int usb6fire_fw_ezusb_write(struct usb_device *device, ...@@ -160,7 +160,7 @@ static int usb6fire_fw_ezusb_write(struct usb_device *device,
{ {
return usb_control_msg_send(device, 0, type, return usb_control_msg_send(device, 0, type,
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, 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, static int usb6fire_fw_ezusb_read(struct usb_device *device,
...@@ -168,7 +168,7 @@ 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, return usb_control_msg_recv(device, 0, type,
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, 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, static int usb6fire_fw_fpga_write(struct usb_device *device,
...@@ -178,7 +178,7 @@ 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; int ret;
ret = usb_bulk_msg(device, usb_sndbulkpipe(device, FPGA_EP), data, len, ret = usb_bulk_msg(device, usb_sndbulkpipe(device, FPGA_EP), data, len,
&actual_len, HZ); &actual_len, 1000);
if (ret < 0) if (ret < 0)
return ret; return ret;
else if (actual_len != len) else if (actual_len != len)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment