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 '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: hda: Fix 0 dB for Packard Bell models using Conexant CX20549 (Venice)
ALSA: hda - Add quirk for Dell Inspiron 19T using a Conexant CX20582
ALSA: take tu->qlock with irqs disabled
ALSA: hda: Use olpc-xo-1_5 quirk for Toshiba Satellite P500-PSPGSC-01800T
ALSA: hda: Use olpc-xo-1_5 quirk for Toshiba Satellite Pro T130-15F
ALSA: hda - fix array indexing while creating inputs for Cirrus codecs
ALSA: es968: fix wrong PnP dma index

Linus Torvalds 38c9e91b 1d7aec30

+11 -6
unified split
+3 -2
sound/core/timer.c
··· 1160 1160 { 1161 1161 struct snd_timer_user *tu = timeri->callback_data; 1162 1162 struct snd_timer_tread r1; 1163 + unsigned long flags; 1163 1164 1164 1165 if (event >= SNDRV_TIMER_EVENT_START && 1165 1166 event <= SNDRV_TIMER_EVENT_PAUSE) ··· 1170 1169 r1.event = event; 1171 1170 r1.tstamp = *tstamp; 1172 1171 r1.val = resolution; 1173 - spin_lock(&tu->qlock); 1172 + spin_lock_irqsave(&tu->qlock, flags); 1174 1173 snd_timer_user_append_to_tqueue(tu, &r1); 1175 - spin_unlock(&tu->qlock); 1174 + spin_unlock_irqrestore(&tu->qlock, flags); 1176 1175 kill_fasync(&tu->fasync, SIGIO, POLL_IN); 1177 1176 wake_up(&tu->qchange_sleep); 1178 1177 }
+1 -1
sound/isa/sb/es968.c
··· 93 93 return err; 94 94 } 95 95 port[dev] = pnp_port_start(pdev, 0); 96 - dma8[dev] = pnp_dma(pdev, 1); 96 + dma8[dev] = pnp_dma(pdev, 0); 97 97 irq[dev] = pnp_irq(pdev, 0); 98 98 99 99 return 0;
+1 -1
sound/pci/hda/patch_cirrus.c
··· 766 766 for (n = 0; n < AUTO_PIN_LAST; n++) { 767 767 if (!spec->adc_nid[n]) 768 768 continue; 769 - err = snd_hda_add_nid(codec, kctl, 0, spec->adc_nid[i]); 769 + err = snd_hda_add_nid(codec, kctl, 0, spec->adc_nid[n]); 770 770 if (err < 0) 771 771 return err; 772 772 }
+6 -2
sound/pci/hda/patch_conexant.c
··· 1195 1195 1196 1196 switch (codec->subsystem_id >> 16) { 1197 1197 case 0x103c: 1198 + case 0x1631: 1198 1199 case 0x1734: 1199 - /* HP & Fujitsu-Siemens laptops have really bad sound over 0dB 1200 - * on NID 0x17. Fix max PCM level to 0 dB 1200 + /* HP, Packard Bell, & Fujitsu-Siemens laptops have really bad 1201 + * sound over 0dB on NID 0x17. Fix max PCM level to 0 dB 1201 1202 * (originally it has 0x2b steps with 0dB offset 0x14) 1202 1203 */ 1203 1204 snd_hda_override_amp_caps(codec, 0x17, HDA_INPUT, ··· 2843 2842 CXT5066_DELL_LAPTOP), 2844 2843 SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5), 2845 2844 SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTO), 2845 + SND_PCI_QUIRK(0x1028, 0x0408, "Dell Inspiron One 19T", CXT5066_IDEAPAD), 2846 + SND_PCI_QUIRK(0x1179, 0xff50, "Toshiba Satellite P500-PSPGSC-01800T", CXT5066_OLPC_XO_1_5), 2847 + SND_PCI_QUIRK(0x1179, 0xffe0, "Toshiba Satellite Pro T130-15F", CXT5066_OLPC_XO_1_5), 2846 2848 SND_PCI_QUIRK(0x17aa, 0x3a0d, "ideapad", CXT5066_IDEAPAD), 2847 2849 {} 2848 2850 };