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/format.c | |
| parent | 6b69a0e520a0dc6579901098d0810bcd2e1ea60b (diff) | |
| download | op-kernel-dev-17d900c4a1b50bc191b3ca58cbd78acc04a1c5b3.zip op-kernel-dev-17d900c4a1b50bc191b3ca58cbd78acc04a1c5b3.tar.gz | |
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/format.c')
| -rw-r--r-- | sound/usb/format.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/format.c b/sound/usb/format.c index 8d042dc..89421d1 100644 --- a/sound/usb/format.c +++ b/sound/usb/format.c @@ -286,7 +286,7 @@ static int parse_audio_format_rates_v2(struct snd_usb_audio *chip, USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN, UAC2_CS_CONTROL_SAM_FREQ << 8, snd_usb_ctrl_intf(chip) | (clock << 8), - tmp, sizeof(tmp), 1000); + tmp, sizeof(tmp)); if (ret < 0) { snd_printk(KERN_ERR "%s(): unable to retrieve number of sample rates (clock %d)\n", @@ -307,7 +307,7 @@ static int parse_audio_format_rates_v2(struct snd_usb_audio *chip, USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN, UAC2_CS_CONTROL_SAM_FREQ << 8, snd_usb_ctrl_intf(chip) | (clock << 8), - data, data_size, 1000); + data, data_size); if (ret < 0) { snd_printk(KERN_ERR "%s(): unable to retrieve sample rate range (clock %d)\n", |
