ALSA: usb-audio: increase control transfer timeout
authorClemens Ladisch <clemens@ladisch.de>
Mon, 26 Sep 2011 19:15:27 +0000 (21:15 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 27 Sep 2011 07:21:48 +0000 (09:21 +0200)
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>
sound/usb/clock.c
sound/usb/format.c
sound/usb/helper.c
sound/usb/helper.h
sound/usb/mixer.c
sound/usb/mixer_quirks.c
sound/usb/pcm.c
sound/usb/quirks.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc sound/usb/pcm.c
Simple merge
Simple merge