Merge branch 'fix/misc' into for-linus (a86ba285) · Commits · e / devices / android_kernel_teracube_2e

sound/core/pcm_native.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -315,10 +315,10 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream,
		if (!params->info)
		params->info = hw->info & ~SNDRV_PCM_INFO_FIFO_IN_FRAMES;
		if (!params->fifo_size) {
		if (snd_mask_min(&params->masks[SNDRV_PCM_HW_PARAM_FORMAT]) ==
		snd_mask_max(&params->masks[SNDRV_PCM_HW_PARAM_FORMAT]) &&
		snd_mask_min(&params->masks[SNDRV_PCM_HW_PARAM_CHANNELS]) ==
		snd_mask_max(&params->masks[SNDRV_PCM_HW_PARAM_CHANNELS])) {
		m = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
		i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
		if (snd_mask_min(m) == snd_mask_max(m) &&
		snd_interval_min(i) == snd_interval_max(i)) {
		changed = substream->ops->ioctl(substream,
		SNDRV_PCM_IOCTL1_FIFO_SIZE, params);
		if (changed < 0)

+3 −1

Original line number	Diff line number	Diff line
		@@ -1821,7 +1821,9 @@ static irqreturn_t snd_echo_interrupt(int irq, void *dev_id)
		/* The hardware doesn't tell us which substream caused the irq,
		thus we have to check all running substreams. */
		for (ss = 0; ss < DSP_MAXPIPES; ss++) {
		if ((substream = chip->substream[ss])) {
		substream = chip->substream[ss];
		if (substream && ((struct audiopipe *)substream->runtime->
		private_data)->state == PIPE_STATE_STARTED) {
		period = pcm_pointer(substream) /
		substream->runtime->period_size;
		if (period != chip->last_period[ss]) {

+6 −0

Original line number	Diff line number	Diff line
		@@ -1790,6 +1790,12 @@ static struct ac97_quirk ac97_quirks[] = {
		.name = "ASRock K7VT2",
		.type = AC97_TUNE_HP_ONLY
		},
		{
		.subvendor = 0x110a,
		.subdevice = 0x0079,
		.name = "Fujitsu Siemens D1289",
		.type = AC97_TUNE_HP_ONLY
		},
		{
		.subvendor = 0x1019,
		.subdevice = 0x0a81,

+15 −3

Original line number	Diff line number	Diff line
		@@ -1162,10 +1162,22 @@ static int snd_usbmidi_out_endpoint_create(struct snd_usb_midi* umidi,
		pipe = usb_sndintpipe(umidi->dev, ep_info->out_ep);
		else
		pipe = usb_sndbulkpipe(umidi->dev, ep_info->out_ep);
		if (umidi->usb_id == USB_ID(0x0a92, 0x1020)) /* ESI M4U */
		ep->max_transfer = 4;
		else
		switch (umidi->usb_id) {
		default:
		ep->max_transfer = usb_maxpacket(umidi->dev, pipe, 1);
		break;
		/*
		* Various chips declare a packet size larger than 4 bytes, but
		* do not actually work with larger packets:
		*/
		case USB_ID(0x0a92, 0x1020): /* ESI M4U */
		case USB_ID(0x1430, 0x474b): /* RedOctane GH MIDI INTERFACE */
		case USB_ID(0x15ca, 0x0101): /* Textech USB Midi Cable */
		case USB_ID(0x15ca, 0x1806): /* Textech USB Midi Cable */
		case USB_ID(0x1a86, 0x752d): /* QinHeng CH345 "USB2.0-MIDI" */
		ep->max_transfer = 4;
		break;
		}
		for (i = 0; i < OUTPUT_URBS; ++i) {
		buffer = usb_buffer_alloc(umidi->dev,
		ep->max_transfer, GFP_KERNEL,