diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2011-09-26 21:15:27 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-09-27 09:21:48 +0200 |
| commit | 17d900c4a1b50bc191b3ca58cbd78acc04a1c5b3 (patch) | |
| tree | 7640521988e285f1afa0e3dd44aa73a5333ccb38 /sound/usb/helper.c | |
| parent | 6b69a0e520a0dc6579901098d0810bcd2e1ea60b (diff) | |
| download | linux-3.10-17d900c4a1b50bc191b3ca58cbd78acc04a1c5b3.tar.gz linux-3.10-17d900c4a1b50bc191b3ca58cbd78acc04a1c5b3.tar.bz2 linux-3.10-17d900c4a1b50bc191b3ca58cbd78acc04a1c5b3.zip | |
ALSA: usb-audio: increase control transfer timeout
There are certain devices that are reportedly so slow that they need
more than 100 ms to handle control transfers. Therefore, increase the
timeout in mixer(_quirks).c to 1000 ms.
The timeout parameter of snd_usb_ctl_msg() is now constant, so we can
drop it.
Reported-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/helper.c')
| -rw-r--r-- | sound/usb/helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/helper.c b/sound/usb/helper.c index f280c1903c2..9eed8f40b17 100644 --- a/sound/usb/helper.c +++ b/sound/usb/helper.c @@ -81,7 +81,7 @@ void *snd_usb_find_csint_desc(void *buffer, int buflen, void *after, u8 dsubtype */ int snd_usb_ctl_msg(struct usb_device *dev, unsigned int pipe, __u8 request, __u8 requesttype, __u16 value, __u16 index, void *data, - __u16 size, int timeout) + __u16 size) { int err; void *buf = NULL; @@ -92,7 +92,7 @@ int snd_usb_ctl_msg(struct usb_device *dev, unsigned int pipe, __u8 request, return -ENOMEM; } err = usb_control_msg(dev, pipe, request, requesttype, - value, index, buf, size, timeout); + value, index, buf, size, 1000); if (size > 0) { memcpy(data, buf, size); kfree(buf); |