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

Commit eb6e7041 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/misc' into for-linus

parents 8fda43c1 e8bdb6bb

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

+84 −20
Original line number Diff line number Diff line
@@ -205,6 +205,60 @@ static int parse_audio_format_rates_v1(struct snd_usb_audio *chip, struct audiof 
	return 0;

}



/*

 * Helper function to walk the array of sample rate triplets reported by

 * the device. The problem is that we need to parse whole array first to

 * get to know how many sample rates we have to expect.

 * Then fp->rate_table can be allocated and filled.

 */

static int parse_uac2_sample_rate_range(struct audioformat *fp, int nr_triplets,

					const unsigned char *data)

{

	int i, nr_rates = 0;



	fp->rates = fp->rate_min = fp->rate_max = 0;



	for (i = 0; i < nr_triplets; i++) {

		int min = combine_quad(&data[2 + 12 * i]);

		int max = combine_quad(&data[6 + 12 * i]);

		int res = combine_quad(&data[10 + 12 * i]);

		int rate;



		if ((max < 0) || (min < 0) || (res < 0) || (max < min))

			continue;



		/*

		 * for ranges with res == 1, we announce a continuous sample

		 * rate range, and this function should return 0 for no further

		 * parsing.

		 */

		if (res == 1) {

			fp->rate_min = min;

			fp->rate_max = max;

			fp->rates = SNDRV_PCM_RATE_CONTINUOUS;

			return 0;

		}



		for (rate = min; rate <= max; rate += res) {

			if (fp->rate_table)

				fp->rate_table[nr_rates] = rate;

			if (!fp->rate_min || rate < fp->rate_min)

				fp->rate_min = rate;

			if (!fp->rate_max || rate > fp->rate_max)

				fp->rate_max = rate;

			fp->rates |= snd_pcm_rate_to_rate_bit(rate);



			nr_rates++;



			/* avoid endless loop */

			if (res == 0)

				break;

		}

	}



	return nr_rates;

}



/*

 * parse the format descriptor and stores the possible sample rates

 * on the audioformat table (audio class v2).
@@ -215,13 +269,20 @@ static int parse_audio_format_rates_v2(struct snd_usb_audio *chip, 
{

	struct usb_device *dev = chip->dev;

	unsigned char tmp[2], *data;

	int i, nr_rates, data_size, ret = 0;

	int nr_triplets, data_size, ret = 0;

	int clock = snd_usb_clock_find_source(chip, chip->ctrl_intf, fp->clock);



	if (clock < 0) {

		snd_printk(KERN_ERR "%s(): unable to find clock source (clock %d)\n",

				__func__, clock);

		goto err;

	}



	/* 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) {
@@ -230,8 +291,8 @@ static int parse_audio_format_rates_v2(struct snd_usb_audio *chip, 
		goto err;

	}



	nr_rates = (tmp[1] << 8) | tmp[0];

	data_size = 2 + 12 * nr_rates;

	nr_triplets = (tmp[1] << 8) | tmp[0];

	data_size = 2 + 12 * nr_triplets;

	data = kzalloc(data_size, GFP_KERNEL);

	if (!data) {

		ret = -ENOMEM;
@@ -241,7 +302,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) {
@@ -251,26 +313,28 @@ static int parse_audio_format_rates_v2(struct snd_usb_audio *chip, 
		goto err_free;

	}



	fp->rate_table = kmalloc(sizeof(int) * nr_rates, GFP_KERNEL);

	/* Call the triplet parser, and make sure fp->rate_table is NULL.

	 * We just use the return value to know how many sample rates we

	 * will have to deal with. */

	kfree(fp->rate_table);

	fp->rate_table = NULL;

	fp->nr_rates = parse_uac2_sample_rate_range(fp, nr_triplets, data);



	if (fp->nr_rates == 0) {

		/* SNDRV_PCM_RATE_CONTINUOUS */

		ret = 0;

		goto err_free;

	}



	fp->rate_table = kmalloc(sizeof(int) * fp->nr_rates, GFP_KERNEL);

	if (!fp->rate_table) {

		ret = -ENOMEM;

		goto err_free;

	}



	fp->nr_rates = 0;

	fp->rate_min = fp->rate_max = 0;



	for (i = 0; i < nr_rates; i++) {

		int rate = combine_quad(&data[2 + 12 * i]);



		fp->rate_table[fp->nr_rates] = rate;

		if (!fp->rate_min || rate < fp->rate_min)

			fp->rate_min = rate;

		if (!fp->rate_max || rate > fp->rate_max)

			fp->rate_max = rate;

		fp->rates |= snd_pcm_rate_to_rate_bit(rate);

		fp->nr_rates++;

	}

	/* Call the triplet parser again, but this time, fp->rate_table is

	 * allocated, so the rates will be stored */

	parse_uac2_sample_rate_range(fp, nr_triplets, data);



err_free:

	kfree(data);

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 */

sound/usb/mixer.c

+14 −5
Original line number Diff line number Diff line
@@ -297,20 +297,27 @@ static int get_ctl_value_v1(struct usb_mixer_elem_info *cval, int request, int v 


static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request, int validx, int *value_ret)

{

	unsigned char buf[14]; /* enough space for one range of 4 bytes */

	unsigned char buf[2 + 3*sizeof(__u16)]; /* enough space for one range */

	unsigned char *val;

	int ret;

	int ret, size;

	__u8 bRequest;



	bRequest = (request == UAC_GET_CUR) ?

		UAC2_CS_CUR : UAC2_CS_RANGE;

	if (request == UAC_GET_CUR) {

		bRequest = UAC2_CS_CUR;

		size = sizeof(__u16);

	} else {

		bRequest = UAC2_CS_RANGE;

		size = sizeof(buf);

	}



	memset(buf, 0, sizeof(buf));



	ret = snd_usb_ctl_msg(cval->mixer->chip->dev,

			      usb_rcvctrlpipe(cval->mixer->chip->dev, 0),

			      bRequest,

			      USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,

			      validx, cval->mixer->ctrlif | (cval->id << 8),

			      buf, sizeof(buf), 1000);

			      buf, size, 1000);



	if (ret < 0) {

		snd_printk(KERN_ERR "cannot get ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n",
@@ -318,6 +325,8 @@ static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request, int v 
		return ret;

	}



	/* FIXME: how should we handle multiple triplets here? */



	switch (request) {

	case UAC_GET_CUR:

		val = buf;