5.18-stable patches

added patches:
	alsa-ctxfi-add-sb046x-pci-id.patch

diff --git a/queue-5.18/alsa-ctxfi-add-sb046x-pci-id.patch b/queue-5.18/alsa-ctxfi-add-sb046x-pci-id.patch
new file mode 100644 (file)
index 0000000..aea7a14
--- /dev/null
+++ b/queue-5.18/alsa-ctxfi-add-sb046x-pci-id.patch
@@ -0,0 +1,59 @@
+From 1b073ebb174d0c7109b438e0a5eb4495137803ec Mon Sep 17 00:00:00 2001
+From: Edward Matijevic <motolav@gmail.com>
+Date: Fri, 20 May 2022 23:45:15 -0500
+Subject: ALSA: ctxfi: Add SB046x PCI ID
+
+From: Edward Matijevic <motolav@gmail.com>
+
+commit 1b073ebb174d0c7109b438e0a5eb4495137803ec upstream.
+
+Adds the PCI ID for X-Fi cards sold under the Platnum and XtremeMusic names
+
+Before: snd_ctxfi 0000:05:05.0: chip 20K1 model Unknown (1102:0021) is found
+After: snd_ctxfi 0000:05:05.0: chip 20K1 model SB046x (1102:0021) is found
+
+[ This is only about defining the model name string, and the rest is
+  handled just like before, as a default unknown device.
+  Edward confirmed that the stuff has been working fine -- tiwai ]
+
+Signed-off-by: Edward Matijevic <motolav@gmail.com>
+Cc: <stable@vger.kernel.org>
+Link: https://lore.kernel.org/r/cae7d1a4-8bd9-7dfe-7427-db7e766f7272@gmail.com
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/pci/ctxfi/ctatc.c      |    2 ++
+ sound/pci/ctxfi/cthardware.h |    3 ++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+--- a/sound/pci/ctxfi/ctatc.c
++++ b/sound/pci/ctxfi/ctatc.c
+@@ -36,6 +36,7 @@
+                           | ((IEC958_AES3_CON_FS_48000) << 24))
+ 
+ static const struct snd_pci_quirk subsys_20k1_list[] = {
++      SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0021, "SB046x", CTSB046X),
+       SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0022, "SB055x", CTSB055X),
+       SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x002f, "SB055x", CTSB055X),
+       SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0029, "SB073x", CTSB073X),
+@@ -64,6 +65,7 @@ static const struct snd_pci_quirk subsys
+ 
+ static const char *ct_subsys_name[NUM_CTCARDS] = {
+       /* 20k1 models */
++      [CTSB046X]      = "SB046x",
+       [CTSB055X]      = "SB055x",
+       [CTSB073X]      = "SB073x",
+       [CTUAA]         = "UAA",
+--- a/sound/pci/ctxfi/cthardware.h
++++ b/sound/pci/ctxfi/cthardware.h
+@@ -26,8 +26,9 @@ enum CHIPTYP {
+ 
+ enum CTCARDS {
+       /* 20k1 models */
++      CTSB046X,
++      CT20K1_MODEL_FIRST = CTSB046X,
+       CTSB055X,
+-      CT20K1_MODEL_FIRST = CTSB055X,
+       CTSB073X,
+       CTUAA,
+       CT20K1_UNKNOWN,

diff --git a/queue-5.18/series b/queue-5.18/series
index da68cd3ec366b419d70749acf8d27da8312604dc..f86da601ac2bfee0c809d956ddec157ff6da0993 100644 (file)
--- a/queue-5.18/series
+++ b/queue-5.18/series
@@ -44,3 +44,4 @@ random-convert-to-using-fops-write_iter.patch
 random-wire-up-fops-splice_-read-write-_iter.patch
 random-check-for-signals-after-page-of-pool-writes.patch
 acpi-sysfs-fix-bert-error-region-memory-mapping.patch
+alsa-ctxfi-add-sb046x-pci-id.patch