From cc1489511096e0ebdb17d16f1e7299bf68734a8e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 19 Aug 2020 11:02:55 +0200 Subject: [PATCH] Revert "ALSA: usb-audio: work around streaming quirk for MacroSilicon MS2109" This reverts commit 10de419977bfbe9f99d1c8a3cef7cbf4660d7d84 which is commit 1b7ecc241a67ad6b584e071bd791a54e0cd5f097 upstream. It breaks the abi for the android11-5.4 branch, and isn't needed in android devices, so just revert it. Signed-off-by: Greg Kroah-Hartman Change-Id: I081472f3c3663edaa0c1275fe5e1303833bd533c --- sound/usb/card.h | 1 - sound/usb/pcm.c | 6 ------ sound/usb/quirks.c | 3 --- sound/usb/stream.c | 1 - 4 files changed, 11 deletions(-) diff --git a/sound/usb/card.h b/sound/usb/card.h index e52f6191f7b0..e1fa9d1ed148 100644 --- a/sound/usb/card.h +++ b/sound/usb/card.h @@ -140,7 +140,6 @@ struct snd_usb_substream { unsigned int tx_length_quirk:1; /* add length specifier to transfers */ unsigned int fmt_type; /* USB audio format type (1-3) */ unsigned int pkt_offset_adj; /* Bytes to drop from beginning of packets (for non-compliant devices) */ - unsigned int stream_offset_adj; /* Bytes to drop from beginning of stream (for non-compliant devices) */ unsigned int running: 1; /* running status */ diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 38f4735c4ee0..c485b3b8c968 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -1585,12 +1585,6 @@ static void retire_capture_urb(struct snd_usb_substream *subs, // continue; } bytes = urb->iso_frame_desc[i].actual_length; - if (subs->stream_offset_adj > 0) { - unsigned int adj = min(subs->stream_offset_adj, bytes); - cp += adj; - bytes -= adj; - subs->stream_offset_adj -= adj; - } frames = bytes / stride; if (!subs->txfr_quirk) bytes = frames * stride; diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index a756f50d9f07..a8bb953cc468 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1432,9 +1432,6 @@ 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; - break; } } diff --git a/sound/usb/stream.c b/sound/usb/stream.c index db5e99d8061d..f40961c7c673 100644 --- a/sound/usb/stream.c +++ b/sound/usb/stream.c @@ -98,7 +98,6 @@ 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; - subs->stream_offset_adj = 0; snd_usb_set_pcm_ops(as->pcm, stream);