Skip to content

Commit 7b430fb

Browse files
tiwaigregkh
tiwai
authored and
gregkh
committed
ALSA: usb-audio: Sort quirk table entries
commit 668abe6 upstream. The quirk table entries should be put in the USB ID order, but some entries have been put in random places. Re-sort them. Fixes: bf990c1 ("ALSA: usb-audio: add quirk to fix Hamedal C20 disconnect issue") Fixes: fd28941 ("ALSA: usb-audio: Add new quirk FIXED_RATE for JBL Quantum810 Wireless") Fixes: dfd5fe1 ("ALSA: usb-audio: Add FIXED_RATE quirk for JBL Quantum610 Wireless") Fixes: 4a63e68 ("ALSA: usb-audio: Fix microphone sound on Nexigo webcam.") Fixes: 7822baa ("ALSA: usb-audio: add quirk for RODE NT-USB+") Fixes: 4fb7c24 ("ALSA: usb-audio: Add quirk for Fiero SC-01") Fixes: 2307a0e ("ALSA: usb-audio: Add quirk for Fiero SC-01 (fw v1.0.0)") Link: https://lore.kernel.org/r/20240124155307.16996-1-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 06040fa commit 7b430fb

1 file changed

Lines changed: 18 additions & 18 deletions

File tree

‎sound/usb/quirks.c‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2035,6 +2035,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
20352035
QUIRK_FLAG_GET_SAMPLE_RATE),
20362036
DEVICE_FLG(0x04e8, 0xa051, /* Samsung USBC Headset (AKG) */
20372037
QUIRK_FLAG_SKIP_CLOCK_SELECTOR | QUIRK_FLAG_CTL_MSG_DELAY_5M),
2038+
DEVICE_FLG(0x0525, 0xa4ad, /* Hamedal C20 usb camero */
2039+
QUIRK_FLAG_IFACE_SKIP_CLOSE),
20382040
DEVICE_FLG(0x054c, 0x0b8c, /* Sony WALKMAN NW-A45 DAC */
20392041
QUIRK_FLAG_SET_IFACE_FIRST),
20402042
DEVICE_FLG(0x0556, 0x0014, /* Phoenix Audio TMX320VC */
@@ -2081,8 +2083,14 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
20812083
QUIRK_FLAG_CTL_MSG_DELAY_1M),
20822084
DEVICE_FLG(0x0b0e, 0x0349, /* Jabra 550a */
20832085
QUIRK_FLAG_CTL_MSG_DELAY_1M),
2086+
DEVICE_FLG(0x0ecb, 0x205c, /* JBL Quantum610 Wireless */
2087+
QUIRK_FLAG_FIXED_RATE),
2088+
DEVICE_FLG(0x0ecb, 0x2069, /* JBL Quantum810 Wireless */
2089+
QUIRK_FLAG_FIXED_RATE),
20842090
DEVICE_FLG(0x0fd9, 0x0008, /* Hauppauge HVR-950Q */
20852091
QUIRK_FLAG_SHARE_MEDIA_DEVICE | QUIRK_FLAG_ALIGN_TRANSFER),
2092+
DEVICE_FLG(0x1224, 0x2a25, /* Jieli Technology USB PHY 2.0 */
2093+
QUIRK_FLAG_GET_SAMPLE_RATE),
20862094
DEVICE_FLG(0x1395, 0x740a, /* Sennheiser DECT */
20872095
QUIRK_FLAG_GET_SAMPLE_RATE),
20882096
DEVICE_FLG(0x1397, 0x0507, /* Behringer UMC202HD */
@@ -2115,6 +2123,10 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
21152123
QUIRK_FLAG_ITF_USB_DSD_DAC | QUIRK_FLAG_CTL_MSG_DELAY),
21162124
DEVICE_FLG(0x1901, 0x0191, /* GE B850V3 CP2114 audio interface */
21172125
QUIRK_FLAG_GET_SAMPLE_RATE),
2126+
DEVICE_FLG(0x19f7, 0x0035, /* RODE NT-USB+ */
2127+
QUIRK_FLAG_GET_SAMPLE_RATE),
2128+
DEVICE_FLG(0x1bcf, 0x2283, /* NexiGo N930AF FHD Webcam */
2129+
QUIRK_FLAG_GET_SAMPLE_RATE),
21182130
DEVICE_FLG(0x2040, 0x7200, /* Hauppauge HVR-950Q */
21192131
QUIRK_FLAG_SHARE_MEDIA_DEVICE | QUIRK_FLAG_ALIGN_TRANSFER),
21202132
DEVICE_FLG(0x2040, 0x7201, /* Hauppauge HVR-950Q-MXL */
@@ -2157,6 +2169,12 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
21572169
QUIRK_FLAG_IGNORE_CTL_ERROR),
21582170
DEVICE_FLG(0x2912, 0x30c8, /* Audioengine D1 */
21592171
QUIRK_FLAG_GET_SAMPLE_RATE),
2172+
DEVICE_FLG(0x2b53, 0x0023, /* Fiero SC-01 (firmware v1.0.0 @ 48 kHz) */
2173+
QUIRK_FLAG_GENERIC_IMPLICIT_FB),
2174+
DEVICE_FLG(0x2b53, 0x0024, /* Fiero SC-01 (firmware v1.0.0 @ 96 kHz) */
2175+
QUIRK_FLAG_GENERIC_IMPLICIT_FB),
2176+
DEVICE_FLG(0x2b53, 0x0031, /* Fiero SC-01 (firmware v1.1.0) */
2177+
QUIRK_FLAG_GENERIC_IMPLICIT_FB),
21602178
DEVICE_FLG(0x30be, 0x0101, /* Schiit Hel */
21612179
QUIRK_FLAG_IGNORE_CTL_ERROR),
21622180
DEVICE_FLG(0x413c, 0xa506, /* Dell AE515 sound bar */
@@ -2165,24 +2183,6 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
21652183
QUIRK_FLAG_ALIGN_TRANSFER),
21662184
DEVICE_FLG(0x534d, 0x2109, /* MacroSilicon MS2109 */
21672185
QUIRK_FLAG_ALIGN_TRANSFER),
2168-
DEVICE_FLG(0x1224, 0x2a25, /* Jieli Technology USB PHY 2.0 */
2169-
QUIRK_FLAG_GET_SAMPLE_RATE),
2170-
DEVICE_FLG(0x2b53, 0x0023, /* Fiero SC-01 (firmware v1.0.0 @ 48 kHz) */
2171-
QUIRK_FLAG_GENERIC_IMPLICIT_FB),
2172-
DEVICE_FLG(0x2b53, 0x0024, /* Fiero SC-01 (firmware v1.0.0 @ 96 kHz) */
2173-
QUIRK_FLAG_GENERIC_IMPLICIT_FB),
2174-
DEVICE_FLG(0x2b53, 0x0031, /* Fiero SC-01 (firmware v1.1.0) */
2175-
QUIRK_FLAG_GENERIC_IMPLICIT_FB),
2176-
DEVICE_FLG(0x0525, 0xa4ad, /* Hamedal C20 usb camero */
2177-
QUIRK_FLAG_IFACE_SKIP_CLOSE),
2178-
DEVICE_FLG(0x0ecb, 0x205c, /* JBL Quantum610 Wireless */
2179-
QUIRK_FLAG_FIXED_RATE),
2180-
DEVICE_FLG(0x0ecb, 0x2069, /* JBL Quantum810 Wireless */
2181-
QUIRK_FLAG_FIXED_RATE),
2182-
DEVICE_FLG(0x1bcf, 0x2283, /* NexiGo N930AF FHD Webcam */
2183-
QUIRK_FLAG_GET_SAMPLE_RATE),
2184-
DEVICE_FLG(0x19f7, 0x0035, /* RODE NT-USB+ */
2185-
QUIRK_FLAG_GET_SAMPLE_RATE),
21862186

21872187
/* Vendor matches */
21882188
VENDOR_FLG(0x045e, /* MS Lifecam */

0 commit comments

Comments
 (0)