lkml.org 
[lkml]   [2021]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 012/162] ALSA: 6fire: fix control and bulk message timeouts
    Date
    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
    @@ -99,7 +99,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
    @@ -166,7 +166,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)
    @@ -179,7 +179,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)
    @@ -194,7 +194,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)

    \
     
     \ /
      Last update: 2021-11-24 13:00    [W:4.109 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site