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 - Enable beep on Realtek codecs with PCI SSID override
ALSA: usb-audio - Add volume resolution quirk for some Logitech webcams
ALSA: hda - Add Macbook 5,2 quirk
ALSA: hda - Fix uninitialized variable

Linus Torvalds b9f39959 c77e9e68

+18 -2
unified split
+5 -2
sound/pci/hda/patch_realtek.c
··· 1268 1268 struct alc_spec *spec = codec->spec; 1269 1269 1270 1270 ass = codec->subsystem_id & 0xffff; 1271 - if (ass != codec->bus->pci->subsystem_device && (ass & 1)) 1271 + if (ass != codec->bus->pci->subsystem_device && (ass & 1)) { 1272 + spec->cdefine.enable_pcbeep = 1; /* assume always enabled */ 1272 1273 goto do_sku; 1274 + } 1273 1275 1274 1276 nid = 0x1d; 1275 1277 if (codec->vendor_id == 0x10ec0260) ··· 2549 2547 static int alc_build_controls(struct hda_codec *codec) 2550 2548 { 2551 2549 struct alc_spec *spec = codec->spec; 2552 - struct snd_kcontrol *kctl; 2550 + struct snd_kcontrol *kctl = NULL; 2553 2551 struct snd_kcontrol_new *knew; 2554 2552 int i, j, err; 2555 2553 unsigned int u; ··· 9488 9486 SND_PCI_QUIRK(0x106b, 0x3e00, "iMac 24 Aluminum", ALC885_IMAC24), 9489 9487 SND_PCI_QUIRK(0x106b, 0x4900, "iMac 9,1 Aluminum", ALC885_IMAC91), 9490 9488 SND_PCI_QUIRK(0x106b, 0x3f00, "Macbook 5,1", ALC885_MB5), 9489 + SND_PCI_QUIRK(0x106b, 0x4a00, "Macbook 5,2", ALC885_MB5), 9491 9490 /* FIXME: HP jack sense seems not working for MBP 5,1 or 5,2, 9492 9491 * so apparently no perfect solution yet 9493 9492 */
+13
sound/usb/mixer.c
··· 1107 1107 } 1108 1108 break; 1109 1109 1110 + case USB_ID(0x046d, 0x0809): 1111 + case USB_ID(0x046d, 0x0991): 1112 + /* Most audio usb devices lie about volume resolution. 1113 + * Most Logitech webcams have res = 384. 1114 + * Proboly there is some logitech magic behind this number --fishor 1115 + */ 1116 + if (!strcmp(kctl->id.name, "Mic Capture Volume")) { 1117 + snd_printk(KERN_INFO 1118 + "set resolution quirk: cval->res = 384\n"); 1119 + cval->res = 384; 1120 + } 1121 + break; 1122 + 1110 1123 } 1111 1124 1112 1125 snd_printdd(KERN_INFO "[%d] FU [%s] ch = %d, val = %d/%d/%d\n",