shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-03-24 19:40:21 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ALSA: usb-audio: Add quirk for Tascam Model 12"

Browse Source 
This reverts commit d16ae91186 which is
commit 67df411db3 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I3be3b72b2133285590c3c005ecef2117c2f5fcb4
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-05-16 10:16:57 +00:00
parent 16f74f5669
commit a3c598c3ac
3 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sound/usb/endpoint.c
View File

@@ -1682,12 +1682,6 @@ void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep, bool keep_pending)
if (ep->clock_ref)
atomic_dec(&ep->clock_ref->locked);
if (ep->chip->quirk_flags & QUIRK_FLAG_FORCE_IFACE_RESET &&
usb_pipeout(ep->pipe)) {
ep->need_prepare = true;
if (ep->iface_ref)
ep->iface_ref->need_setup = true;
}
trace_android_vh_audio_usb_offload_ep_action(ep, false);
}
}

2
sound/usb/quirks.c
View File

@@ -1786,8 +1786,6 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
DEVICE_FLG(0x0644, 0x804a, /* TEAC UD-301 */
QUIRK_FLAG_ITF_USB_DSD_DAC | QUIRK_FLAG_CTL_MSG_DELAY |
QUIRK_FLAG_IFACE_DELAY),
DEVICE_FLG(0x0644, 0x805f, /* TEAC Model 12 */
QUIRK_FLAG_FORCE_IFACE_RESET),
DEVICE_FLG(0x06f8, 0xb000, /* Hercules DJ Console (Windows Edition) */
QUIRK_FLAG_IGNORE_CTL_ERROR),
DEVICE_FLG(0x06f8, 0xd002, /* Hercules DJ Console (Macintosh Edition) */

4
sound/usb/usbaudio.h
View File

@@ -179,9 +179,6 @@ extern bool snd_usb_skip_validation;
* Don't apply implicit feedback sync mode
* QUIRK_FLAG_IFACE_SKIP_CLOSE
* Don't closed interface during setting sample rate
* QUIRK_FLAG_FORCE_IFACE_RESET
* Force an interface reset whenever stopping & restarting a stream
* (e.g. after xrun)
*/
#define QUIRK_FLAG_GET_SAMPLE_RATE (1U << 0)
@@ -204,6 +201,5 @@ extern bool snd_usb_skip_validation;
#define QUIRK_FLAG_GENERIC_IMPLICIT_FB (1U << 17)
#define QUIRK_FLAG_SKIP_IMPLICIT_FB (1U << 18)
#define QUIRK_FLAG_IFACE_SKIP_CLOSE (1U << 19)
#define QUIRK_FLAG_FORCE_IFACE_RESET (1U << 20)
#endif /* __USBAUDIO_H */