Skip to content

Commit d4edb07

Browse files
tiwaitiwai
committed
Merge branch 'for-linus' into for-next
Merge 5.19-rc devel branch for applying HD-audio quirk patches more cleanly. Signed-off-by: Takashi Iwai <[email protected]>
2 parents 26ae150 + cf33ce6 commit d4edb07

File tree

3 files changed

+34
-9
lines changed

3 files changed

+34
-9
lines changed

‎sound/pci/cs46xx/cs46xx.c‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,36 +74,36 @@ static int snd_card_cs46xx_probe(struct pci_dev *pci,
7474
err = snd_cs46xx_create(card, pci,
7575
external_amp[dev], thinkpad[dev]);
7676
if (err < 0)
77-
return err;
77+
goto error;
7878
card->private_data = chip;
7979
chip->accept_valid = mmap_valid[dev];
8080
err = snd_cs46xx_pcm(chip, 0);
8181
if (err < 0)
82-
return err;
82+
goto error;
8383
#ifdef CONFIG_SND_CS46XX_NEW_DSP
8484
err = snd_cs46xx_pcm_rear(chip, 1);
8585
if (err < 0)
86-
return err;
86+
goto error;
8787
err = snd_cs46xx_pcm_iec958(chip, 2);
8888
if (err < 0)
89-
return err;
89+
goto error;
9090
#endif
9191
err = snd_cs46xx_mixer(chip, 2);
9292
if (err < 0)
93-
return err;
93+
goto error;
9494
#ifdef CONFIG_SND_CS46XX_NEW_DSP
9595
if (chip->nr_ac97_codecs ==2) {
9696
err = snd_cs46xx_pcm_center_lfe(chip, 3);
9797
if (err < 0)
98-
return err;
98+
goto error;
9999
}
100100
#endif
101101
err = snd_cs46xx_midi(chip, 0);
102102
if (err < 0)
103-
return err;
103+
goto error;
104104
err = snd_cs46xx_start_dsp(chip);
105105
if (err < 0)
106-
return err;
106+
goto error;
107107

108108
snd_cs46xx_gameport(chip);
109109

@@ -117,11 +117,15 @@ static int snd_card_cs46xx_probe(struct pci_dev *pci,
117117

118118
err = snd_card_register(card);
119119
if (err < 0)
120-
return err;
120+
goto error;
121121

122122
pci_set_drvdata(pci, card);
123123
dev++;
124124
return 0;
125+
126+
error:
127+
snd_card_free(card);
128+
return err;
125129
}
126130

127131
static struct pci_driver cs46xx_driver = {

‎sound/pci/hda/patch_conexant.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -944,6 +944,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {
944944
SND_PCI_QUIRK(0x103c, 0x828c, "HP EliteBook 840 G4", CXT_FIXUP_HP_DOCK),
945945
SND_PCI_QUIRK(0x103c, 0x8299, "HP 800 G3 SFF", CXT_FIXUP_HP_MIC_NO_PRESENCE),
946946
SND_PCI_QUIRK(0x103c, 0x829a, "HP 800 G3 DM", CXT_FIXUP_HP_MIC_NO_PRESENCE),
947+
SND_PCI_QUIRK(0x103c, 0x82b4, "HP ProDesk 600 G3", CXT_FIXUP_HP_MIC_NO_PRESENCE),
947948
SND_PCI_QUIRK(0x103c, 0x836e, "HP ProBook 455 G5", CXT_FIXUP_MUTE_LED_GPIO),
948949
SND_PCI_QUIRK(0x103c, 0x837f, "HP ProBook 470 G5", CXT_FIXUP_MUTE_LED_GPIO),
949950
SND_PCI_QUIRK(0x103c, 0x83b2, "HP EliteBook 840 G5", CXT_FIXUP_HP_DOCK),

‎sound/pci/hda/patch_realtek.c‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6925,6 +6925,7 @@ enum {
69256925
ALC298_FIXUP_LENOVO_SPK_VOLUME,
69266926
ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER,
69276927
ALC269_FIXUP_ATIV_BOOK_8,
6928+
ALC221_FIXUP_HP_288PRO_MIC_NO_PRESENCE,
69286929
ALC221_FIXUP_HP_MIC_NO_PRESENCE,
69296930
ALC256_FIXUP_ASUS_HEADSET_MODE,
69306931
ALC256_FIXUP_ASUS_MIC,
@@ -7861,6 +7862,16 @@ static const struct hda_fixup alc269_fixups[] = {
78617862
.chained = true,
78627863
.chain_id = ALC269_FIXUP_NO_SHUTUP
78637864
},
7865+
[ALC221_FIXUP_HP_288PRO_MIC_NO_PRESENCE] = {
7866+
.type = HDA_FIXUP_PINS,
7867+
.v.pins = (const struct hda_pintbl[]) {
7868+
{ 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */
7869+
{ 0x1a, 0x01813030 }, /* use as headphone mic, without its own jack detect */
7870+
{ }
7871+
},
7872+
.chained = true,
7873+
.chain_id = ALC269_FIXUP_HEADSET_MODE
7874+
},
78647875
[ALC221_FIXUP_HP_MIC_NO_PRESENCE] = {
78657876
.type = HDA_FIXUP_PINS,
78667877
.v.pins = (const struct hda_pintbl[]) {
@@ -8910,6 +8921,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
89108921
SND_PCI_QUIRK(0x1025, 0x1290, "Acer Veriton Z4860G", ALC286_FIXUP_ACER_AIO_HEADSET_MIC),
89118922
SND_PCI_QUIRK(0x1025, 0x1291, "Acer Veriton Z4660G", ALC286_FIXUP_ACER_AIO_HEADSET_MIC),
89128923
SND_PCI_QUIRK(0x1025, 0x129c, "Acer SWIFT SF314-55", ALC256_FIXUP_ACER_HEADSET_MIC),
8924+
SND_PCI_QUIRK(0x1025, 0x129d, "Acer SWIFT SF313-51", ALC256_FIXUP_ACER_MIC_NO_PRESENCE),
89138925
SND_PCI_QUIRK(0x1025, 0x1300, "Acer SWIFT SF314-56", ALC256_FIXUP_ACER_MIC_NO_PRESENCE),
89148926
SND_PCI_QUIRK(0x1025, 0x1308, "Acer Aspire Z24-890", ALC286_FIXUP_ACER_AIO_HEADSET_MIC),
89158927
SND_PCI_QUIRK(0x1025, 0x132a, "Acer TravelMate B114-21", ALC233_FIXUP_ACER_HEADSET_MIC),
@@ -8919,6 +8931,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
89198931
SND_PCI_QUIRK(0x1025, 0x1430, "Acer TravelMate B311R-31", ALC256_FIXUP_ACER_MIC_NO_PRESENCE),
89208932
SND_PCI_QUIRK(0x1025, 0x1466, "Acer Aspire A515-56", ALC255_FIXUP_ACER_HEADPHONE_AND_MIC),
89218933
SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),
8934+
SND_PCI_QUIRK(0x1028, 0x053c, "Dell Latitude E5430", ALC292_FIXUP_DELL_E7X),
89228935
SND_PCI_QUIRK(0x1028, 0x054b, "Dell XPS one 2710", ALC275_FIXUP_DELL_XPS),
89238936
SND_PCI_QUIRK(0x1028, 0x05bd, "Dell Latitude E6440", ALC292_FIXUP_DELL_E7X),
89248937
SND_PCI_QUIRK(0x1028, 0x05be, "Dell Latitude E6540", ALC292_FIXUP_DELL_E7X),
@@ -9034,6 +9047,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
90349047
SND_PCI_QUIRK(0x103c, 0x2335, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
90359048
SND_PCI_QUIRK(0x103c, 0x2336, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
90369049
SND_PCI_QUIRK(0x103c, 0x2337, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
9050+
SND_PCI_QUIRK(0x103c, 0x2b5e, "HP 288 Pro G2 MT", ALC221_FIXUP_HP_288PRO_MIC_NO_PRESENCE),
90379051
SND_PCI_QUIRK(0x103c, 0x802e, "HP Z240 SFF", ALC221_FIXUP_HP_MIC_NO_PRESENCE),
90389052
SND_PCI_QUIRK(0x103c, 0x802f, "HP Z240", ALC221_FIXUP_HP_MIC_NO_PRESENCE),
90399053
SND_PCI_QUIRK(0x103c, 0x8077, "HP", ALC256_FIXUP_HP_HEADSET_MIC),
@@ -9120,6 +9134,10 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
91209134
SND_PCI_QUIRK(0x103c, 0x89c6, "Zbook Fury 17 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
91219135
SND_PCI_QUIRK(0x103c, 0x89ca, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
91229136
SND_PCI_QUIRK(0x103c, 0x8a78, "HP Dev One", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST),
9137+
SND_PCI_QUIRK(0x103c, 0x8aa0, "HP ProBook 440 G9 (MB 8A9E)", ALC236_FIXUP_HP_GPIO_LED),
9138+
SND_PCI_QUIRK(0x103c, 0x8aa3, "HP ProBook 450 G9 (MB 8AA1)", ALC236_FIXUP_HP_GPIO_LED),
9139+
SND_PCI_QUIRK(0x103c, 0x8aa8, "HP EliteBook 640 G9 (MB 8AA6)", ALC236_FIXUP_HP_GPIO_LED),
9140+
SND_PCI_QUIRK(0x103c, 0x8aab, "HP EliteBook 650 G9 (MB 8AA9)", ALC236_FIXUP_HP_GPIO_LED),
91239141
SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC),
91249142
SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300),
91259143
SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
@@ -9379,6 +9397,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
93799397
SND_PCI_QUIRK(0x1d72, 0x1602, "RedmiBook", ALC255_FIXUP_XIAOMI_HEADSET_MIC),
93809398
SND_PCI_QUIRK(0x1d72, 0x1701, "XiaomiNotebook Pro", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE),
93819399
SND_PCI_QUIRK(0x1d72, 0x1901, "RedmiBook 14", ALC256_FIXUP_ASUS_HEADSET_MIC),
9400+
SND_PCI_QUIRK(0x1d72, 0x1945, "Redmi G", ALC256_FIXUP_ASUS_HEADSET_MIC),
93829401
SND_PCI_QUIRK(0x1d72, 0x1947, "RedmiBook Air", ALC255_FIXUP_XIAOMI_HEADSET_MIC),
93839402
SND_PCI_QUIRK(0x8086, 0x2074, "Intel NUC 8", ALC233_FIXUP_INTEL_NUC8_DMIC),
93849403
SND_PCI_QUIRK(0x8086, 0x2080, "Intel NUC 8 Rugged", ALC256_FIXUP_INTEL_NUC8_RUGGED),
@@ -11241,6 +11260,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = {
1124111260
SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800),
1124211261
SND_PCI_QUIRK(0x103c, 0x8719, "HP", ALC897_FIXUP_HP_HSMIC_VERB),
1124311262
SND_PCI_QUIRK(0x103c, 0x873e, "HP", ALC671_FIXUP_HP_HEADSET_MIC2),
11263+
SND_PCI_QUIRK(0x103c, 0x877e, "HP 288 Pro G6", ALC671_FIXUP_HP_HEADSET_MIC2),
1124411264
SND_PCI_QUIRK(0x103c, 0x885f, "HP 288 Pro G8", ALC671_FIXUP_HP_HEADSET_MIC2),
1124511265
SND_PCI_QUIRK(0x1043, 0x1080, "Asus UX501VW", ALC668_FIXUP_HEADSET_MODE),
1124611266
SND_PCI_QUIRK(0x1043, 0x11cd, "Asus N550", ALC662_FIXUP_ASUS_Nx50),

0 commit comments

Comments
 (0)