Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sound-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"A collection of small fixes. All changes are device-specific and
trivial, mostly HD-audio and USB-audio quirks and fixups"
* tag 'sound-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda/realtek: Add quirk for HP ProBook 450 G8
ALSA: usb-audio: fix uac2 clock source at terminal parser
ALSA: hda/realtek: add quirk for HP pavilion aero laptop 13z-be200
ALSA: hda/cirrus fix cs420x MacPro 6,1 inverted jack detection
ALSA: usb-audio: Add DSD quirk for LEAK Stereo 230
ALSA: au88x0: Fix incorrect error handling for PCI config reads
+11
-5
+1
sound/hda/codecs/cirrus/cs420x.c
+1
sound/hda/codecs/cirrus/cs420x.c
···
585
585
SND_PCI_QUIRK(0x106b, 0x6c00, "MacMini 7,1", CS4208_MACMINI),
586
586
SND_PCI_QUIRK(0x106b, 0x7100, "MacBookAir 6,1", CS4208_MBA6),
587
587
SND_PCI_QUIRK(0x106b, 0x7200, "MacBookAir 6,2", CS4208_MBA6),
588
+
SND_PCI_QUIRK(0x106b, 0x7800, "MacPro 6,1", CS4208_MACMINI),
588
589
SND_PCI_QUIRK(0x106b, 0x7b00, "MacBookPro 12,1", CS4208_MBP11),
589
590
{} /* terminator */
590
591
};
+2
sound/hda/codecs/realtek/alc269.c
+2
sound/hda/codecs/realtek/alc269.c
···
6525
6525
SND_PCI_QUIRK(0x103c, 0x8a4f, "HP Victus 15-fa0xxx (MB 8A4F)", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),
6526
6526
SND_PCI_QUIRK(0x103c, 0x8a6e, "HP EDNA 360", ALC287_FIXUP_CS35L41_I2C_4),
6527
6527
SND_PCI_QUIRK(0x103c, 0x8a74, "HP ProBook 440 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
6528
+
SND_PCI_QUIRK(0x103c, 0x8a75, "HP ProBook 450 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
6528
6529
SND_PCI_QUIRK(0x103c, 0x8a78, "HP Dev One", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST),
6529
6530
SND_PCI_QUIRK(0x103c, 0x8aa0, "HP ProBook 440 G9 (MB 8A9E)", ALC236_FIXUP_HP_GPIO_LED),
6530
6531
SND_PCI_QUIRK(0x103c, 0x8aa3, "HP ProBook 450 G9 (MB 8AA1)", ALC236_FIXUP_HP_GPIO_LED),
···
6573
6572
SND_PCI_QUIRK(0x103c, 0x8bc8, "HP Victus 15-fa1xxx", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),
6574
6573
SND_PCI_QUIRK(0x103c, 0x8bcd, "HP Omen 16-xd0xxx", ALC245_FIXUP_HP_MUTE_LED_V1_COEFBIT),
6575
6574
SND_PCI_QUIRK(0x103c, 0x8bd4, "HP Victus 16-s0xxx (MB 8BD4)", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),
6575
+
SND_PCI_QUIRK(0x103c, 0x8bd6, "HP Pavilion Aero Laptop 13z-be200", ALC287_FIXUP_HP_GPIO_LED),
6576
6576
SND_PCI_QUIRK(0x103c, 0x8bdd, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),
6577
6577
SND_PCI_QUIRK(0x103c, 0x8bde, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),
6578
6578
SND_PCI_QUIRK(0x103c, 0x8bdf, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),
+4
-4
sound/pci/au88x0/au88x0.c
+4
-4
sound/pci/au88x0/au88x0.c
···
280
280
281
281
// (5)
282
282
err = pci_read_config_word(pci, PCI_DEVICE_ID, &chip->device);
283
-
if (err < 0)
284
-
return err;
283
+
if (err)
284
+
return pcibios_err_to_errno(err);
285
285
err = pci_read_config_word(pci, PCI_VENDOR_ID, &chip->vendor);
286
-
if (err < 0)
287
-
return err;
286
+
if (err)
287
+
return pcibios_err_to_errno(err);
288
288
chip->rev = pci->revision;
289
289
#ifdef CHIP_AU8830
290
290
if ((chip->rev) != 0xfe && (chip->rev) != 0xfa) {
+1
-1
sound/usb/mixer.c
+1
-1
sound/usb/mixer.c
+3
sound/usb/quirks.c
+3
sound/usb/quirks.c
···
2030
2030
case USB_ID(0x249c, 0x9326): /* M2Tech Young MkIII */
2031
2031
case USB_ID(0x2616, 0x0106): /* PS Audio NuWave DAC */
2032
2032
case USB_ID(0x2622, 0x0041): /* Audiolab M-DAC+ */
2033
+
case USB_ID(0x2622, 0x0061): /* LEAK Stereo 230 */
2033
2034
case USB_ID(0x278b, 0x5100): /* Rotel RC-1590 */
2034
2035
case USB_ID(0x27f7, 0x3002): /* W4S DAC-2v2SE */
2035
2036
case USB_ID(0x29a2, 0x0086): /* Mutec MC3+ USB */
···
2428
2427
QUIRK_FLAG_CTL_MSG_DELAY | QUIRK_FLAG_IFACE_DELAY |
2429
2428
QUIRK_FLAG_DSD_RAW),
2430
2429
VENDOR_FLG(0x25ce, /* Mytek devices */
2430
+
QUIRK_FLAG_DSD_RAW),
2431
+
VENDOR_FLG(0x2622, /* IAG Limited devices */
2431
2432
QUIRK_FLAG_DSD_RAW),
2432
2433
VENDOR_FLG(0x278b, /* Rotel? */
2433
2434
QUIRK_FLAG_DSD_RAW),