Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-06-14 20:28:51 +0200
committerTakashi Iwai <tiwai@suse.de>2019-06-14 20:29:01 +0200
commit30cc945fe58190da4f7451945b1c1c3eb89712ab (patch)
treeef7d3bc3a492995451b5b2715074e0866b6f761b
parentdea29f1626f335e63755ef2c3c0d4942688189be (diff)
ALSA: oxfw: allow PCM capture for Stanton SCS.1m (bsc#1051510).
-rw-r--r--patches.drivers/ALSA-oxfw-allow-PCM-capture-for-Stanton-SCS.1m.patch41
-rw-r--r--series.conf1
2 files changed, 42 insertions, 0 deletions
diff --git a/patches.drivers/ALSA-oxfw-allow-PCM-capture-for-Stanton-SCS.1m.patch b/patches.drivers/ALSA-oxfw-allow-PCM-capture-for-Stanton-SCS.1m.patch
new file mode 100644
index 0000000000..3407e24b9a
--- /dev/null
+++ b/patches.drivers/ALSA-oxfw-allow-PCM-capture-for-Stanton-SCS.1m.patch
@@ -0,0 +1,41 @@
+From d8fa87c368f5b4096c4746894fdcc195da285df1 Mon Sep 17 00:00:00 2001
+From: Takashi Sakamoto <o-takashi@sakamocchi.jp>
+Date: Sun, 9 Jun 2019 19:29:12 +0900
+Subject: [PATCH] ALSA: oxfw: allow PCM capture for Stanton SCS.1m
+Git-commit: d8fa87c368f5b4096c4746894fdcc195da285df1
+Patch-mainline: v5.2-rc5
+References: bsc#1051510
+
+Stanton SCS.1m can transfer isochronous packet with Multi Bit Linear
+Audio data channels, therefore it allows software to capture PCM
+substream. However, ALSA oxfw driver doesn't.
+
+This commit changes the driver to add one PCM substream for capture
+direction.
+
+Fixes: de5126cc3c0b ("ALSA: oxfw: add stream format quirk for SCS.1 models")
+Cc: <stable@vger.kernel.org> # v4.5+
+Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ sound/firewire/oxfw/oxfw.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
+index 3d27f3378d5d..b4bef574929d 100644
+--- a/sound/firewire/oxfw/oxfw.c
++++ b/sound/firewire/oxfw/oxfw.c
+@@ -148,9 +148,6 @@ static int detect_quirks(struct snd_oxfw *oxfw)
+ oxfw->midi_input_ports = 0;
+ oxfw->midi_output_ports = 0;
+
+- /* Output stream exists but no data channels are useful. */
+- oxfw->has_output = false;
+-
+ return snd_oxfw_scs1x_add(oxfw);
+ }
+
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index aa44916df9..800f42bb4d 100644
--- a/series.conf
+++ b/series.conf
@@ -22430,6 +22430,7 @@
patches.fixes/0001-test_firmware-Use-correct-snprintf-limit.patch
patches.drivers/ALSA-hda-realtek-Update-headset-mode-for-ALC256.patch
patches.drivers/ALSA-firewire-motu-fix-destruction-of-data-for-isoch.patch
+ patches.drivers/ALSA-oxfw-allow-PCM-capture-for-Stanton-SCS.1m.patch
# davem/net
patches.drivers/ibmvnic-Do-not-close-unopened-driver-during-reset.patch