hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf
kernel/sound/pci/hda/patch_ca0132.c
....@@ -1272,6 +1272,7 @@
12721272 SND_PCI_QUIRK(0x1458, 0xA026, "Gigabyte G1.Sniper Z97", QUIRK_R3DI),
12731273 SND_PCI_QUIRK(0x1458, 0xA036, "Gigabyte GA-Z170X-Gaming 7", QUIRK_R3DI),
12741274 SND_PCI_QUIRK(0x3842, 0x1038, "EVGA X99 Classified", QUIRK_R3DI),
1275
+ SND_PCI_QUIRK(0x3842, 0x104b, "EVGA X299 Dark", QUIRK_R3DI),
12751276 SND_PCI_QUIRK(0x3842, 0x1055, "EVGA Z390 DARK", QUIRK_R3DI),
12761277 SND_PCI_QUIRK(0x1102, 0x0013, "Recon3D", QUIRK_R3D),
12771278 SND_PCI_QUIRK(0x1102, 0x0018, "Recon3D", QUIRK_R3D),
....@@ -2331,7 +2332,7 @@
23312332 static int dspio_alloc_dma_chan(struct hda_codec *codec, unsigned int *dma_chan)
23322333 {
23332334 int status = 0;
2334
- unsigned int size = sizeof(dma_chan);
2335
+ unsigned int size = sizeof(*dma_chan);
23352336
23362337 codec_dbg(codec, " dspio_alloc_dma_chan() -- begin\n");
23372338 status = dspio_scp(codec, MASTERCONTROL, 0x20,
....@@ -4108,8 +4109,10 @@
41084109
41094110 for (i = 0; i < TUNING_CTLS_COUNT; i++)
41104111 if (nid == ca0132_tuning_ctls[i].nid)
4111
- break;
4112
+ goto found;
41124113
4114
+ return -EINVAL;
4115
+found:
41134116 snd_hda_power_up(codec);
41144117 dspio_set_param(codec, ca0132_tuning_ctls[i].mid, 0x20,
41154118 ca0132_tuning_ctls[i].req,