Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: ctxfi: Swapped SURROUND-SIDE channels on emu20k2
ALSA: ca0106 - Fix the max capture buffer size
ALSA: hda - Fix pin-setup for Sony VAIO with STAC9872 codecs
ALSA: hda - Add quirk for Gateway T6834c laptop
ALSA: OSS sequencer should be initialized after snd_seq_system_client_init
ALSA: sound/isa: convert nested spin_lock_irqsave to spin_lock
ALSA: hda_codec: Check for invalid zero connections
+19
-13
+2
-5
sound/core/seq/Makefile
+2
-5
sound/core/seq/Makefile
···
3
3
# Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
4
4
#
5
5
6
-
ifeq ($(CONFIG_SND_SEQUENCER_OSS),y)
7
-
obj-$(CONFIG_SND_SEQUENCER) += oss/
8
-
endif
9
-
10
6
snd-seq-device-objs := seq_device.o
11
7
snd-seq-objs := seq.o seq_lock.o seq_clientmgr.o seq_memory.o seq_queue.o \
12
8
seq_fifo.o seq_prioq.o seq_timer.o \
···
15
19
16
20
obj-$(CONFIG_SND_SEQUENCER) += snd-seq.o snd-seq-device.o
17
21
ifeq ($(CONFIG_SND_SEQUENCER_OSS),y)
18
-
obj-$(CONFIG_SND_SEQUENCER) += snd-seq-midi-event.o
22
+
obj-$(CONFIG_SND_SEQUENCER) += snd-seq-midi-event.o
23
+
obj-$(CONFIG_SND_SEQUENCER) += oss/
19
24
endif
20
25
obj-$(CONFIG_SND_SEQ_DUMMY) += snd-seq-dummy.o
21
26
+2
-2
sound/isa/gus/gus_pcm.c
+2
-2
sound/isa/gus/gus_pcm.c
···
795
795
if (!(pcmp->flags & SNDRV_GF1_PCM_PFLG_ACTIVE))
796
796
continue;
797
797
/* load real volume - better precision */
798
-
spin_lock_irqsave(&gus->reg_lock, flags);
798
+
spin_lock(&gus->reg_lock);
799
799
snd_gf1_select_voice(gus, pvoice->number);
800
800
snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_VOLUME_CONTROL);
801
801
vol = pvoice == pcmp->pvoices[0] ? gus->gf1.pcm_volume_level_left : gus->gf1.pcm_volume_level_right;
802
802
snd_gf1_write16(gus, SNDRV_GF1_VW_VOLUME, vol);
803
803
pcmp->final_volume = 1;
804
-
spin_unlock_irqrestore(&gus->reg_lock, flags);
804
+
spin_unlock(&gus->reg_lock);
805
805
}
806
806
spin_unlock_irqrestore(&gus->voice_alloc, flags);
807
807
return change;
+2
-2
sound/pci/ca0106/ca0106_main.c
+2
-2
sound/pci/ca0106/ca0106_main.c
···
325
325
.rate_max = 192000,
326
326
.channels_min = 2,
327
327
.channels_max = 2,
328
-
.buffer_bytes_max = ((65536 - 64) * 8),
328
+
.buffer_bytes_max = 65536 - 128,
329
329
.period_bytes_min = 64,
330
-
.period_bytes_max = (65536 - 64),
330
+
.period_bytes_max = 32768 - 64,
331
331
.periods_min = 2,
332
332
.periods_max = 2,
333
333
.fifo_size = 0,
+2
-2
sound/pci/ctxfi/ctdaio.c
+2
-2
sound/pci/ctxfi/ctdaio.c
···
57
57
58
58
struct daio_rsc_idx idx_20k2[NUM_DAIOTYP] = {
59
59
[LINEO1] = {.left = 0x40, .right = 0x41},
60
-
[LINEO2] = {.left = 0x70, .right = 0x71},
60
+
[LINEO2] = {.left = 0x60, .right = 0x61},
61
61
[LINEO3] = {.left = 0x50, .right = 0x51},
62
-
[LINEO4] = {.left = 0x60, .right = 0x61},
62
+
[LINEO4] = {.left = 0x70, .right = 0x71},
63
63
[LINEIM] = {.left = 0x45, .right = 0xc5},
64
64
[SPDIFOO] = {.left = 0x00, .right = 0x01},
65
65
[SPDIFIO] = {.left = 0x05, .right = 0x85},
+6
sound/pci/hda/hda_codec.c
+6
sound/pci/hda/hda_codec.c
···
332
332
AC_VERB_GET_CONNECT_LIST, i);
333
333
range_val = !!(parm & (1 << (shift-1))); /* ranges */
334
334
val = parm & mask;
335
+
if (val == 0) {
336
+
snd_printk(KERN_WARNING "hda_codec: "
337
+
"invalid CONNECT_LIST verb %x[%i]:%x\n",
338
+
nid, i, parm);
339
+
return 0;
340
+
}
335
341
parm >>= shift;
336
342
if (range_val) {
337
343
/* ranges between the previous and this one */
+5
-2
sound/pci/hda/patch_sigmatel.c
+5
-2
sound/pci/hda/patch_sigmatel.c
···
2378
2378
SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0228,
2379
2379
"Dell Vostro 1500", STAC_9205_DELL_M42),
2380
2380
/* Gateway */
2381
+
SND_PCI_QUIRK(0x107b, 0x0560, "Gateway T6834c", STAC_9205_EAPD),
2381
2382
SND_PCI_QUIRK(0x107b, 0x0565, "Gateway T1616", STAC_9205_EAPD),
2382
2383
{} /* terminator */
2383
2384
};
···
5855
5854
};
5856
5855
5857
5856
static struct snd_pci_quirk stac9872_cfg_tbl[] = {
5857
+
SND_PCI_QUIRK_MASK(0x104d, 0xfff0, 0x81e0,
5858
+
"Sony VAIO F/S", STAC_9872_VAIO),
5858
5859
{} /* terminator */
5859
5860
};
5860
5861
···
5869
5866
if (spec == NULL)
5870
5867
return -ENOMEM;
5871
5868
codec->spec = spec;
5869
+
spec->num_pins = ARRAY_SIZE(stac9872_pin_nids);
5870
+
spec->pin_nids = stac9872_pin_nids;
5872
5871
5873
5872
spec->board_config = snd_hda_check_board_config(codec, STAC_9872_MODELS,
5874
5873
stac9872_models,
···
5882
5877
stac92xx_set_config_regs(codec,
5883
5878
stac9872_brd_tbl[spec->board_config]);
5884
5879
5885
-
spec->num_pins = ARRAY_SIZE(stac9872_pin_nids);
5886
-
spec->pin_nids = stac9872_pin_nids;
5887
5880
spec->multiout.dac_nids = spec->dac_nids;
5888
5881
spec->num_adcs = ARRAY_SIZE(stac9872_adc_nids);
5889
5882
spec->adc_nids = stac9872_adc_nids;