[alsa-devel] [PATCH] ALSA: snd-usb-audio: set the timeout for usb control set messages to 5000 ms

[Daniel Mack]

Hi Daniel,

On 19.04.2013 23:39, Daniel Schürmann wrote:
> This is a patch against
> https://git.kernel.org/cgit/linux/kernel/git/tiwai/sound.git/
> 581cbef46ae60073252208fc1f26dd1044f6e215

Yeah, we're getting there :)

> Set the timeout for USB control set messages according to the USB 2 spec
> §9.2.6.4 to 5000 ms.
> To avoid new issues, the get timeout is unchanged at 1000 ms, though it
> is 500 ms in the spec.
> This patch is required to run the Hercules RMX2 which needs a timeout >
> 1240 ms
> 
> Signed-off-by: Daniel Schürmann <daschuer at mixxx.org>
> ---
> diff --git a/sound/usb/helper.c b/sound/usb/helper.c
> index c1db28f..b4f3876 100644
> --- a/sound/usb/helper.c
> +++ b/sound/usb/helper.c
> @@ -21,7 +21,11 @@
>  
>  #include "usbaudio.h"
>  #include "helper.h"
> -#include "quirks.h"

That is a stray change which shouldn't be part of this patch.

> +
> +/* Value from 9.2.6.4 USB 2 spec */
> +#define USB_MSG_SET_TIMEOUT 5000
> +/* Value from spec is 500 but we pick 1000 for legacy reasons */
> +#define USB_MSG_GET_TIMEOUT 1000
>  
>  /*
>   * combine bytes and get an integer value
> @@ -86,14 +90,24 @@ int snd_usb_ctl_msg(struct usb_device *dev, unsigned
> int pipe, __u8 request,
>  {
>      int err;
>      void *buf = NULL;
> +    int timeout;

Can be unsigned, but that's a minor.

>  
>      if (size > 0) {
>          buf = kmemdup(data, size, GFP_KERNEL);
>          if (!buf)
>              return -ENOMEM;
>      }
> +
> +    if (requesttype & USB_DIR_IN) {
> +        /* Get Request */
> +        timeout = USB_MSG_GET_TIMEOUT;
> +    } else {
> +        /* Set Request */
> +        timeout = USB_MSG_SET_TIMEOUT;
> +    }

You can omit the comments, they don't add any value for someone who's
reading the code. And you don't need the curly braces.

Other than that, looks good to me.


Can you send an updated version?


Thanks,
Daniel


>      err = usb_control_msg(dev, pipe, request, requesttype,
> -                  value, index, buf, size, 1000);
> +                  value, index, buf, size, timeout);
> +
>      if (size > 0) {
>          memcpy(data, buf, size);
>          kfree(buf);
>