From: Greg Kroah-Hartman Date: Mon, 14 Nov 2022 10:23:11 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v5.10.155~37 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a06d87650c980d6a0f1433c26bd8f5e78e7fad59;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: alsa-hda-ca0132-add-quirk-for-evga-z390-dark.patch alsa-hda-fix-potential-memleak-in-add_widget_node.patch alsa-usb-audio-add-dsd-support-for-accuphase-dac-60.patch alsa-usb-audio-add-quirk-entry-for-m-audio-micro.patch --- diff --git a/queue-5.4/alsa-hda-ca0132-add-quirk-for-evga-z390-dark.patch b/queue-5.4/alsa-hda-ca0132-add-quirk-for-evga-z390-dark.patch new file mode 100644 index 00000000000..afff898e7b9 --- /dev/null +++ b/queue-5.4/alsa-hda-ca0132-add-quirk-for-evga-z390-dark.patch @@ -0,0 +1,37 @@ +From 0c423e2ffa7edd3f8f9bcf17ce73fa9c7509b99e Mon Sep 17 00:00:00 2001 +From: Xian Wang +Date: Fri, 4 Nov 2022 13:29:13 -0700 +Subject: ALSA: hda/ca0132: add quirk for EVGA Z390 DARK + +From: Xian Wang + +commit 0c423e2ffa7edd3f8f9bcf17ce73fa9c7509b99e upstream. + +The Z390 DARK mainboard uses a CA0132 audio controller. The quirk is +needed to enable surround sound and 3.5mm headphone jack handling in +the front audio connector as well as in the rear of the board when in +stereo mode. + +Page 97 of the linked manual contains instructions to setup the +controller. + +Signed-off-by: Xian Wang +Cc: stable@vger.kernel.org +Link: https://www.evga.com/support/manuals/files/131-CS-E399.pdf +Link: https://lore.kernel.org/r/20221104202913.13904-1-dev@xianwang.io +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_ca0132.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_ca0132.c ++++ b/sound/pci/hda/patch_ca0132.c +@@ -1182,6 +1182,7 @@ static const struct snd_pci_quirk ca0132 + SND_PCI_QUIRK(0x1458, 0xA026, "Gigabyte G1.Sniper Z97", QUIRK_R3DI), + SND_PCI_QUIRK(0x1458, 0xA036, "Gigabyte GA-Z170X-Gaming 7", QUIRK_R3DI), + SND_PCI_QUIRK(0x3842, 0x1038, "EVGA X99 Classified", QUIRK_R3DI), ++ SND_PCI_QUIRK(0x3842, 0x1055, "EVGA Z390 DARK", QUIRK_R3DI), + SND_PCI_QUIRK(0x1102, 0x0013, "Recon3D", QUIRK_R3D), + SND_PCI_QUIRK(0x1102, 0x0018, "Recon3D", QUIRK_R3D), + SND_PCI_QUIRK(0x1102, 0x0051, "Sound Blaster AE-5", QUIRK_AE5), diff --git a/queue-5.4/alsa-hda-fix-potential-memleak-in-add_widget_node.patch b/queue-5.4/alsa-hda-fix-potential-memleak-in-add_widget_node.patch new file mode 100644 index 00000000000..5e7ab98b4d3 --- /dev/null +++ b/queue-5.4/alsa-hda-fix-potential-memleak-in-add_widget_node.patch @@ -0,0 +1,36 @@ +From 9a5523f72bd2b0d66eef3d58810c6eb7b5ffc143 Mon Sep 17 00:00:00 2001 +From: Ye Bin +Date: Thu, 10 Nov 2022 22:45:39 +0800 +Subject: ALSA: hda: fix potential memleak in 'add_widget_node' + +From: Ye Bin + +commit 9a5523f72bd2b0d66eef3d58810c6eb7b5ffc143 upstream. + +As 'kobject_add' may allocated memory for 'kobject->name' when return error. +And in this function, if call 'kobject_add' failed didn't free kobject. +So call 'kobject_put' to recycling resources. + +Signed-off-by: Ye Bin +Cc: +Link: https://lore.kernel.org/r/20221110144539.2989354-1-yebin@huaweicloud.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/hda/hdac_sysfs.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/sound/hda/hdac_sysfs.c ++++ b/sound/hda/hdac_sysfs.c +@@ -346,8 +346,10 @@ static int add_widget_node(struct kobjec + return -ENOMEM; + kobject_init(kobj, &widget_ktype); + err = kobject_add(kobj, parent, "%02x", nid); +- if (err < 0) ++ if (err < 0) { ++ kobject_put(kobj); + return err; ++ } + err = sysfs_create_group(kobj, group); + if (err < 0) { + kobject_put(kobj); diff --git a/queue-5.4/alsa-usb-audio-add-dsd-support-for-accuphase-dac-60.patch b/queue-5.4/alsa-usb-audio-add-dsd-support-for-accuphase-dac-60.patch new file mode 100644 index 00000000000..cf377083d3c --- /dev/null +++ b/queue-5.4/alsa-usb-audio-add-dsd-support-for-accuphase-dac-60.patch @@ -0,0 +1,32 @@ +From 8cbd4725ffff3eface1f5f3397af02acad5b2831 Mon Sep 17 00:00:00 2001 +From: Jussi Laako +Date: Wed, 9 Nov 2022 00:12:41 +0200 +Subject: ALSA: usb-audio: Add DSD support for Accuphase DAC-60 + +From: Jussi Laako + +commit 8cbd4725ffff3eface1f5f3397af02acad5b2831 upstream. + +Accuphase DAC-60 option card supports native DSD up to DSD256, +but doesn't have support for auto-detection. Explicitly enable +DSD support for the correct altsetting. + +Signed-off-by: Jussi Laako +Cc: +Link: https://lore.kernel.org/r/20221108221241.1220878-1-jussi@sonarnerd.net +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/usb/quirks.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/usb/quirks.c ++++ b/sound/usb/quirks.c +@@ -1676,6 +1676,7 @@ u64 snd_usb_interface_dsd_format_quirks( + /* XMOS based USB DACs */ + switch (chip->usb_id) { + case USB_ID(0x1511, 0x0037): /* AURALiC VEGA */ ++ case USB_ID(0x21ed, 0xd75a): /* Accuphase DAC-60 option card */ + case USB_ID(0x2522, 0x0012): /* LH Labs VI DAC Infinity */ + case USB_ID(0x2772, 0x0230): /* Pro-Ject Pre Box S2 Digital */ + if (fp->altsetting == 2) diff --git a/queue-5.4/alsa-usb-audio-add-quirk-entry-for-m-audio-micro.patch b/queue-5.4/alsa-usb-audio-add-quirk-entry-for-m-audio-micro.patch new file mode 100644 index 00000000000..51d31a115dd --- /dev/null +++ b/queue-5.4/alsa-usb-audio-add-quirk-entry-for-m-audio-micro.patch @@ -0,0 +1,36 @@ +From 2f01a612d4758b45f775dbb88a49cf534ba47275 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Tue, 8 Nov 2022 15:07:21 +0100 +Subject: ALSA: usb-audio: Add quirk entry for M-Audio Micro + +From: Takashi Iwai + +commit 2f01a612d4758b45f775dbb88a49cf534ba47275 upstream. + +M-Audio Micro (0762:201a) defines the descriptor as vendor-specific, +while the content seems class-compliant. Just overriding the probe +makes the device working. + +Reported-by: Ash Logan +Cc: +Link: https://lore.kernel.org/r/7ecd4417-d860-4773-c1c1-b07433342390@heyquark.com +Link: https://lore.kernel.org/r/20221108140721.24248-1-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/usb/quirks-table.h | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/sound/usb/quirks-table.h ++++ b/sound/usb/quirks-table.h +@@ -2148,6 +2148,10 @@ YAMAHA_DEVICE(0x7010, "UB99"), + } + }, + { ++ /* M-Audio Micro */ ++ USB_DEVICE_VENDOR_SPEC(0x0763, 0x201a), ++}, ++{ + USB_DEVICE_VENDOR_SPEC(0x0763, 0x2030), + .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { + /* .vendor_name = "M-Audio", */ diff --git a/queue-5.4/series b/queue-5.4/series index f3f8dc3c276..f8fe57a94d0 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -40,3 +40,7 @@ mips-jump_label-fix-compat-branch-range-check.patch mmc-cqhci-provide-helper-for-resetting-both-sdhci-and-cqhci.patch mmc-sdhci-of-arasan-fix-sdhci_reset_all-for-cqhci.patch mmc-sdhci-tegra-fix-sdhci_reset_all-for-cqhci.patch +alsa-hda-ca0132-add-quirk-for-evga-z390-dark.patch +alsa-hda-fix-potential-memleak-in-add_widget_node.patch +alsa-usb-audio-add-quirk-entry-for-m-audio-micro.patch +alsa-usb-audio-add-dsd-support-for-accuphase-dac-60.patch