Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17d900c4 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Takashi Iwai
Browse files

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: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6b69a0e5

sound/usb/clock.c

+6 −6
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static int uac_clock_selector_get_val(struct snd_usb_audio *chip, int selector_i 
			      USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,

			      UAC2_CX_CLOCK_SELECTOR << 8,

			      snd_usb_ctrl_intf(chip) | (selector_id << 8),

			      &buf, sizeof(buf), 1000);

			      &buf, sizeof(buf));



	if (ret < 0)

		return ret;
@@ -118,7 +118,7 @@ static bool uac_clock_source_is_valid(struct snd_usb_audio *chip, int source_id) 
			      USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,

			      UAC2_CS_CONTROL_CLOCK_VALID << 8,

			      snd_usb_ctrl_intf(chip) | (source_id << 8),

			      &data, sizeof(data), 1000);

			      &data, sizeof(data));



	if (err < 0) {

		snd_printk(KERN_WARNING "%s(): cannot get clock validity for id %d\n",
@@ -222,7 +222,7 @@ static int set_sample_rate_v1(struct snd_usb_audio *chip, int iface, 
	if ((err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), UAC_SET_CUR,

				   USB_TYPE_CLASS | USB_RECIP_ENDPOINT | USB_DIR_OUT,

				   UAC_EP_CS_ATTR_SAMPLE_RATE << 8, ep,

				   data, sizeof(data), 1000)) < 0) {

				   data, sizeof(data))) < 0) {

		snd_printk(KERN_ERR "%d:%d:%d: cannot set freq %d to ep %#x\n",

			   dev->devnum, iface, fmt->altsetting, rate, ep);

		return err;
@@ -231,7 +231,7 @@ static int set_sample_rate_v1(struct snd_usb_audio *chip, int iface, 
	if ((err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC_GET_CUR,

				   USB_TYPE_CLASS | USB_RECIP_ENDPOINT | USB_DIR_IN,

				   UAC_EP_CS_ATTR_SAMPLE_RATE << 8, ep,

				   data, sizeof(data), 1000)) < 0) {

				   data, sizeof(data))) < 0) {

		snd_printk(KERN_WARNING "%d:%d:%d: cannot get freq at ep %#x\n",

			   dev->devnum, iface, fmt->altsetting, ep);

		return 0; /* some devices don't support reading */
@@ -273,7 +273,7 @@ static int set_sample_rate_v2(struct snd_usb_audio *chip, int iface, 
				   USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_OUT,

				   UAC2_CS_CONTROL_SAM_FREQ << 8,

				   snd_usb_ctrl_intf(chip) | (clock << 8),

				   data, sizeof(data), 1000)) < 0) {

				   data, sizeof(data))) < 0) {

		snd_printk(KERN_ERR "%d:%d:%d: cannot set freq %d (v2)\n",

			   dev->devnum, iface, fmt->altsetting, rate);

		return err;
@@ -283,7 +283,7 @@ static int set_sample_rate_v2(struct snd_usb_audio *chip, int iface, 
				   USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,

				   UAC2_CS_CONTROL_SAM_FREQ << 8,

				   snd_usb_ctrl_intf(chip) | (clock << 8),

				   data, sizeof(data), 1000)) < 0) {

				   data, sizeof(data))) < 0) {

		snd_printk(KERN_WARNING "%d:%d:%d: cannot get freq (v2)\n",

			   dev->devnum, iface, fmt->altsetting);

		return err;

sound/usb/format.c

+2 −2
Original line number Diff line number Diff line
@@ -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",

sound/usb/helper.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

sound/usb/helper.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ void *snd_usb_find_csint_desc(void *descstart, int desclen, void *after, u8 dsub 


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);

		    void *data, __u16 size);



unsigned char snd_usb_parse_datainterval(struct snd_usb_audio *chip,

					 struct usb_host_interface *alts);

sound/usb/mixer.c

+3 −3
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ static int get_ctl_value_v1(struct usb_mixer_elem_info *cval, int request, int v 
		if (snd_usb_ctl_msg(chip->dev, usb_rcvctrlpipe(chip->dev, 0), request,

				    USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,

				    validx, snd_usb_ctrl_intf(chip) | (cval->id << 8),

				    buf, val_len, 100) >= val_len) {

				    buf, val_len) >= val_len) {

			*value_ret = convert_signed_value(cval, snd_usb_combine_bytes(buf, val_len));

			snd_usb_autosuspend(cval->mixer->chip);

			return 0;
@@ -333,7 +333,7 @@ static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request, int v 
	ret = snd_usb_ctl_msg(chip->dev, usb_rcvctrlpipe(chip->dev, 0), bRequest,

			      USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,

			      validx, snd_usb_ctrl_intf(chip) | (cval->id << 8),

			      buf, size, 1000);

			      buf, size);

	snd_usb_autosuspend(chip);



	if (ret < 0) {
@@ -445,7 +445,7 @@ int snd_usb_mixer_set_ctl_value(struct usb_mixer_elem_info *cval, 
				    usb_sndctrlpipe(chip->dev, 0), request,

				    USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_OUT,

				    validx, snd_usb_ctrl_intf(chip) | (cval->id << 8),

				    buf, val_len, 100) >= 0) {

				    buf, val_len) >= 0) {

			snd_usb_autosuspend(chip);

			return 0;

		}