diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-31 15:12:42 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-31 15:12:42 -0400 |
| commit | c0bfbed1cd71657f1707a7a605e85f70c5aa4047 (patch) | |
| tree | 2d626dce20db366f52657f0555e118da4ee970b7 | |
| parent | 44718a59413a47c80c33db3abcb35a46c94588c8 (diff) | |
| download | longterm-queue-5.2-c0bfbed1cd71657f1707a7a605e85f70c5aa4047.tar.gz | |
ALSA: usb: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/ALSA-usb-audio-work-around-streaming-quirk-for-Macro.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/queue/ALSA-usb-audio-work-around-streaming-quirk-for-Macro.patch b/queue/ALSA-usb-audio-work-around-streaming-quirk-for-Macro.patch index 080ed226..3ac208ca 100644 --- a/queue/ALSA-usb-audio-work-around-streaming-quirk-for-Macro.patch +++ b/queue/ALSA-usb-audio-work-around-streaming-quirk-for-Macro.patch @@ -1,4 +1,4 @@ -From 1b7ecc241a67ad6b584e071bd791a54e0cd5f097 Mon Sep 17 00:00:00 2001 +From 74f0d5ee1aeb043d226092624cac97d8d73e288e Mon Sep 17 00:00:00 2001 From: Hector Martin <marcan@marcan.st> Date: Mon, 10 Aug 2020 17:24:00 +0900 Subject: [PATCH] ALSA: usb-audio: work around streaming quirk for MacroSilicon @@ -35,10 +35,10 @@ index de43267b9c8a..5351d7183b1b 100644 unsigned int running: 1; /* running status */ diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c -index 415bfec49a01..5600751803cf 100644 +index 43d8b1dde297..e837ce55f6ad 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c -@@ -1420,6 +1420,12 @@ static void retire_capture_urb(struct snd_usb_substream *subs, +@@ -1417,6 +1417,12 @@ static void retire_capture_urb(struct snd_usb_substream *subs, // continue; } bytes = urb->iso_frame_desc[i].actual_length; @@ -52,12 +52,12 @@ index 415bfec49a01..5600751803cf 100644 if (!subs->txfr_quirk) bytes = frames * stride; diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c -index c551141f337e..abf99b814a0f 100644 +index a8bb953cc468..a756f50d9f07 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c -@@ -1495,6 +1495,9 @@ void snd_usb_set_format_quirk(struct snd_usb_substream *subs, - case USB_ID(0x2b73, 0x000a): /* Pioneer DJ DJM-900NXS2 */ - pioneer_djm_set_format_quirk(subs); +@@ -1432,6 +1432,9 @@ void snd_usb_set_format_quirk(struct snd_usb_substream *subs, + case USB_ID(0x041e, 0x3f19): /* E-Mu 0204 USB */ + set_format_emu_quirk(subs, fmt); break; + case USB_ID(0x534d, 0x2109): /* MacroSilicon MS2109 */ + subs->stream_offset_adj = 2; @@ -66,10 +66,10 @@ index c551141f337e..abf99b814a0f 100644 } diff --git a/sound/usb/stream.c b/sound/usb/stream.c -index 4d1e6579e54d..ca76ba5b5c0b 100644 +index a0649c8ae460..3a17c4c53f87 100644 --- a/sound/usb/stream.c +++ b/sound/usb/stream.c -@@ -94,6 +94,7 @@ static void snd_usb_init_substream(struct snd_usb_stream *as, +@@ -89,6 +89,7 @@ static void snd_usb_init_substream(struct snd_usb_stream *as, subs->tx_length_quirk = as->chip->tx_length_quirk; subs->speed = snd_usb_get_speed(subs->dev); subs->pkt_offset_adj = 0; |