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

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

Merge branch 'fix/usb-audio' into for-linus

parents e6845d91 3b03cc5b

sound/usb/usbaudio.c

+11 −9
Original line number Diff line number Diff line
@@ -2524,7 +2524,6 @@ static int parse_audio_format_rates(struct snd_usb_audio *chip, struct audioform 
		 * build the rate table and bitmap flags

		 */

		int r, idx;

		unsigned int nonzero_rates = 0;



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

		if (fp->rate_table == NULL) {
@@ -2532,24 +2531,27 @@ static int parse_audio_format_rates(struct snd_usb_audio *chip, struct audioform 
			return -1;

		}



		fp->nr_rates = nr_rates;

		fp->rate_min = fp->rate_max = combine_triple(&fmt[8]);

		fp->nr_rates = 0;

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

		for (r = 0, idx = offset + 1; r < nr_rates; r++, idx += 3) {

			unsigned int rate = combine_triple(&fmt[idx]);

			if (!rate)

				continue;

			/* C-Media CM6501 mislabels its 96 kHz altsetting */

			if (rate == 48000 && nr_rates == 1 &&

			    chip->usb_id == USB_ID(0x0d8c, 0x0201) &&

			    (chip->usb_id == USB_ID(0x0d8c, 0x0201) ||

			     chip->usb_id == USB_ID(0x0d8c, 0x0102)) &&

			    fp->altsetting == 5 && fp->maxpacksize == 392)

				rate = 96000;

			fp->rate_table[r] = rate;

			nonzero_rates |= rate;

			if (rate < fp->rate_min)

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

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

				fp->rate_min = rate;

			else if (rate > fp->rate_max)

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

				fp->rate_max = rate;

			fp->rates |= snd_pcm_rate_to_rate_bit(rate);

			fp->nr_rates++;

		}

		if (!nonzero_rates) {

		if (!fp->nr_rates) {

			hwc_debug("All rates were zero. Skipping format!\n");

			return -1;

		}

sound/usb/usbmidi.c

+1 −0
Original line number Diff line number Diff line
@@ -1625,6 +1625,7 @@ static int snd_usbmidi_create_endpoints_midiman(struct snd_usb_midi* umidi, 
	}



	ep_info.out_ep = get_endpoint(hostif, 2)->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;

	ep_info.out_interval = 0;

	ep_info.out_cables = endpoint->out_cables & 0x5555;

	err = snd_usbmidi_out_endpoint_create(umidi, &ep_info, &umidi->endpoints[0]);

	if (err < 0)