tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'fix/misc' into for-linus

Takashi Iwai a86ba285 60b341b7

+28 -8
unified split
+4 -4
sound/core/pcm_native.c
··· 315 if (!params->info) 316 params->info = hw->info & ~SNDRV_PCM_INFO_FIFO_IN_FRAMES; 317 if (!params->fifo_size) { 318 - if (snd_mask_min(&params->masks[SNDRV_PCM_HW_PARAM_FORMAT]) == 319 - snd_mask_max(&params->masks[SNDRV_PCM_HW_PARAM_FORMAT]) && 320 - snd_mask_min(&params->masks[SNDRV_PCM_HW_PARAM_CHANNELS]) == 321 - snd_mask_max(&params->masks[SNDRV_PCM_HW_PARAM_CHANNELS])) { 322 changed = substream->ops->ioctl(substream, 323 SNDRV_PCM_IOCTL1_FIFO_SIZE, params); 324 if (changed < 0)
··· 315 if (!params->info) 316 params->info = hw->info & ~SNDRV_PCM_INFO_FIFO_IN_FRAMES; 317 if (!params->fifo_size) { 318 + m = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT); 319 + i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS); 320 + if (snd_mask_min(m) == snd_mask_max(m) && 321 + snd_interval_min(i) == snd_interval_max(i)) { 322 changed = substream->ops->ioctl(substream, 323 SNDRV_PCM_IOCTL1_FIFO_SIZE, params); 324 if (changed < 0)
+3 -1
sound/pci/echoaudio/echoaudio.c
··· 1821 /* The hardware doesn't tell us which substream caused the irq, 1822 thus we have to check all running substreams. */ 1823 for (ss = 0; ss < DSP_MAXPIPES; ss++) { 1824 - if ((substream = chip->substream[ss])) { 1825 period = pcm_pointer(substream) / 1826 substream->runtime->period_size; 1827 if (period != chip->last_period[ss]) {
··· 1821 /* The hardware doesn't tell us which substream caused the irq, 1822 thus we have to check all running substreams. */ 1823 for (ss = 0; ss < DSP_MAXPIPES; ss++) { 1824 + substream = chip->substream[ss]; 1825 + if (substream && ((struct audiopipe *)substream->runtime-> 1826 + private_data)->state == PIPE_STATE_STARTED) { 1827 period = pcm_pointer(substream) / 1828 substream->runtime->period_size; 1829 if (period != chip->last_period[ss]) {
+6
sound/pci/via82xx.c
··· 1791 .type = AC97_TUNE_HP_ONLY 1792 }, 1793 { 1794 .subvendor = 0x1019, 1795 .subdevice = 0x0a81, 1796 .name = "ECS K7VTA3",
··· 1791 .type = AC97_TUNE_HP_ONLY 1792 }, 1793 { 1794 + .subvendor = 0x110a, 1795 + .subdevice = 0x0079, 1796 + .name = "Fujitsu Siemens D1289", 1797 + .type = AC97_TUNE_HP_ONLY 1798 + }, 1799 + { 1800 .subvendor = 0x1019, 1801 .subdevice = 0x0a81, 1802 .name = "ECS K7VTA3",
+15 -3
sound/usb/usbmidi.c
··· 1162 pipe = usb_sndintpipe(umidi->dev, ep_info->out_ep); 1163 else 1164 pipe = usb_sndbulkpipe(umidi->dev, ep_info->out_ep); 1165 - if (umidi->usb_id == USB_ID(0x0a92, 0x1020)) /* ESI M4U */ 1166 - ep->max_transfer = 4; 1167 - else 1168 ep->max_transfer = usb_maxpacket(umidi->dev, pipe, 1); 1169 for (i = 0; i < OUTPUT_URBS; ++i) { 1170 buffer = usb_buffer_alloc(umidi->dev, 1171 ep->max_transfer, GFP_KERNEL,
··· 1162 pipe = usb_sndintpipe(umidi->dev, ep_info->out_ep); 1163 else 1164 pipe = usb_sndbulkpipe(umidi->dev, ep_info->out_ep); 1165 + switch (umidi->usb_id) { 1166 + default: 1167 ep->max_transfer = usb_maxpacket(umidi->dev, pipe, 1); 1168 + break; 1169 + /* 1170 + * Various chips declare a packet size larger than 4 bytes, but 1171 + * do not actually work with larger packets: 1172 + */ 1173 + case USB_ID(0x0a92, 0x1020): /* ESI M4U */ 1174 + case USB_ID(0x1430, 0x474b): /* RedOctane GH MIDI INTERFACE */ 1175 + case USB_ID(0x15ca, 0x0101): /* Textech USB Midi Cable */ 1176 + case USB_ID(0x15ca, 0x1806): /* Textech USB Midi Cable */ 1177 + case USB_ID(0x1a86, 0x752d): /* QinHeng CH345 "USB2.0-MIDI" */ 1178 + ep->max_transfer = 4; 1179 + break; 1180 + } 1181 for (i = 0; i < OUTPUT_URBS; ++i) { 1182 buffer = usb_buffer_alloc(umidi->dev, 1183 ep->max_transfer, GFP_KERNEL,