diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-02-17 14:22:21 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-02-17 14:22:21 +0100 |
| commit | 9d3415a8cc76ff65c6602a121ac318432c5cd7ba (patch) | |
| tree | 8b8482d8942d1ba5fb6d403010d4765577f25b07 | |
| parent | b721e68bdc5b39c51bf6a1469f8d3663fbe03243 (diff) | |
| parent | 3be522a9514f58e0596db34898a514df206cadc5 (diff) | |
| download | talos-op-linux-9d3415a8cc76ff65c6602a121ac318432c5cd7ba.tar.gz talos-op-linux-9d3415a8cc76ff65c6602a121ac318432c5cd7ba.zip | |
Merge remote branch 'alsa/fixes' into fix/misc
| -rw-r--r-- | sound/core/pcm_native.c | 8 | ||||
| -rw-r--r-- | sound/usb/usbmidi.c | 18 |
2 files changed, 19 insertions, 7 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 25b0641e6b8c..f7e1c9f0d3ed 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -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(¶ms->masks[SNDRV_PCM_HW_PARAM_FORMAT]) == - snd_mask_max(¶ms->masks[SNDRV_PCM_HW_PARAM_FORMAT]) && - snd_mask_min(¶ms->masks[SNDRV_PCM_HW_PARAM_CHANNELS]) == - snd_mask_max(¶ms->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) diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c index 6e89b8368d9a..aae50df06232 100644 --- a/sound/usb/usbmidi.c +++ b/sound/usb/usbmidi.c @@ -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, |
