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

Commit 11bcbc44 authored by Daniel Mack's avatar Daniel Mack Committed by Takashi Iwai
Browse files

ALSA: usb-audio: fix control messages for USB_RECIP_INTERFACE 



Control messages directed to an interface must have the interface number
set in the lower 8 bits of wIndex. This wasn't done correctly for some
clock and mixer messages.

Signed-off-by: default avatarDaniel Mack <daniel@caiaq.de>
Reported-by: default avatarAlex Lee <alexlee188@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d07140ba

sound/usb/clock.c

+8 −4
Original line number Diff line number Diff line
@@ -103,7 +103,8 @@ static int uac_clock_selector_get_val(struct snd_usb_audio *chip, int selector_i 
	ret = snd_usb_ctl_msg(chip->dev, usb_rcvctrlpipe(chip->dev, 0),

			      UAC2_CS_CUR,

			      USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,

			      UAC2_CX_CLOCK_SELECTOR << 8, selector_id << 8,

			      UAC2_CX_CLOCK_SELECTOR << 8,

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

			      &buf, sizeof(buf), 1000);



	if (ret < 0)
@@ -120,7 +121,8 @@ static bool uac_clock_source_is_valid(struct snd_usb_audio *chip, int source_id) 


	err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_CUR,

			      USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,

			      UAC2_CS_CONTROL_CLOCK_VALID << 8, source_id << 8,

			      UAC2_CS_CONTROL_CLOCK_VALID << 8,

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

			      &data, sizeof(data), 1000);



	if (err < 0) {
@@ -269,7 +271,8 @@ static int set_sample_rate_v2(struct snd_usb_audio *chip, int iface, 
	data[3] = rate >> 24;

	if ((err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), UAC2_CS_CUR,

				   USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_OUT,

				   UAC2_CS_CONTROL_SAM_FREQ << 8, clock << 8,

				   UAC2_CS_CONTROL_SAM_FREQ << 8,

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

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

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

			   dev->devnum, iface, fmt->altsetting, rate);
@@ -278,7 +281,8 @@ static int set_sample_rate_v2(struct snd_usb_audio *chip, int iface, 


	if ((err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_CUR,

				   USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,

				   UAC2_CS_CONTROL_SAM_FREQ << 8, clock << 8,

				   UAC2_CS_CONTROL_SAM_FREQ << 8,

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

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

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

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

sound/usb/format.c

+4 −2
Original line number Diff line number Diff line
@@ -227,7 +227,8 @@ static int parse_audio_format_rates_v2(struct snd_usb_audio *chip, 
	/* get the number of sample rates first by only fetching 2 bytes */

	ret = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_RANGE,

			      USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,

			      UAC2_CS_CONTROL_SAM_FREQ << 8, clock << 8,

			      UAC2_CS_CONTROL_SAM_FREQ << 8,

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

			      tmp, sizeof(tmp), 1000);



	if (ret < 0) {
@@ -247,7 +248,8 @@ static int parse_audio_format_rates_v2(struct snd_usb_audio *chip, 
	/* now get the full information */

	ret = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_RANGE,

			      USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,

			      UAC2_CS_CONTROL_SAM_FREQ << 8, clock << 8,

			      UAC2_CS_CONTROL_SAM_FREQ << 8,

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

			      data, data_size, 1000);



	if (ret < 0) {

sound/usb/helper.h

+4 −0
Original line number Diff line number Diff line
@@ -28,5 +28,9 @@ unsigned char snd_usb_parse_datainterval(struct snd_usb_audio *chip, 
#define snd_usb_get_speed(dev) ((dev)->speed)

#endif



static inline int snd_usb_ctrl_intf(struct snd_usb_audio *chip)

{

	return get_iface_desc(chip->ctrl_intf)->bInterfaceNumber;

}



#endif /* __USBAUDIO_HELPER_H */