hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/misc' into for-linus

This commit is contained in:
Takashi Iwai 2010-03-01 12:38:39 +01:00
parent 60b341b778 ad6cfc2ac7
commit a86ba28583
4 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/core/pcm_native.c
View File

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

4
sound/pci/echoaudio/echoaudio.c
View File

@ -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, /* The hardware doesn't tell us which substream caused the irq,
thus we have to check all running substreams. */ thus we have to check all running substreams. */
for (ss = 0; ss < DSP_MAXPIPES; ss++) { 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) / period = pcm_pointer(substream) /
substream->runtime->period_size; substream->runtime->period_size;
if (period != chip->last_period[ss]) { if (period != chip->last_period[ss]) {

6
sound/pci/via82xx.c
View File

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

18
sound/usb/usbmidi.c
View File

@ -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); pipe = usb_sndintpipe(umidi->dev, ep_info->out_ep);
else else
pipe = usb_sndbulkpipe(umidi->dev, ep_info->out_ep); pipe = usb_sndbulkpipe(umidi->dev, ep_info->out_ep);
if (umidi->usb_id == USB_ID(0x0a92, 0x1020)) /* ESI M4U */ switch (umidi->usb_id) {
ep->max_transfer = 4; default:
else
ep->max_transfer = usb_maxpacket(umidi->dev, pipe, 1); 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) { for (i = 0; i < OUTPUT_URBS; ++i) {
buffer = usb_buffer_alloc(umidi->dev, buffer = usb_buffer_alloc(umidi->dev,
ep->max_transfer, GFP_KERNEL, ep->max_transfer, GFP_KERNEL,