Skip to content

Commit 668abe6

Browse files
committed
ALSA: usb-audio: Sort quirk table entries
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/[email protected] Signed-off-by: Takashi Iwai <[email protected]>
1 parent 7822baa commit 668abe6

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

sound/usb/quirks.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2037,6 +2037,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
20372037
QUIRK_FLAG_GET_SAMPLE_RATE),
20382038
DEVICE_FLG(0x04e8, 0xa051, /* Samsung USBC Headset (AKG) */
20392039
QUIRK_FLAG_SKIP_CLOCK_SELECTOR | QUIRK_FLAG_CTL_MSG_DELAY_5M),
2040+
DEVICE_FLG(0x0525, 0xa4ad, /* Hamedal C20 usb camero */
2041+
QUIRK_FLAG_IFACE_SKIP_CLOSE),
20402042
DEVICE_FLG(0x054c, 0x0b8c, /* Sony WALKMAN NW-A45 DAC */
20412043
QUIRK_FLAG_SET_IFACE_FIRST),
20422044
DEVICE_FLG(0x0556, 0x0014, /* Phoenix Audio TMX320VC */
@@ -2083,8 +2085,14 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
20832085
QUIRK_FLAG_CTL_MSG_DELAY_1M),
20842086
DEVICE_FLG(0x0b0e, 0x0349, /* Jabra 550a */
20852087
QUIRK_FLAG_CTL_MSG_DELAY_1M),
2088+
DEVICE_FLG(0x0ecb, 0x205c, /* JBL Quantum610 Wireless */
2089+
QUIRK_FLAG_FIXED_RATE),
2090+
DEVICE_FLG(0x0ecb, 0x2069, /* JBL Quantum810 Wireless */
2091+
QUIRK_FLAG_FIXED_RATE),
20862092
DEVICE_FLG(0x0fd9, 0x0008, /* Hauppauge HVR-950Q */
20872093
QUIRK_FLAG_SHARE_MEDIA_DEVICE | QUIRK_FLAG_ALIGN_TRANSFER),
2094+
DEVICE_FLG(0x1224, 0x2a25, /* Jieli Technology USB PHY 2.0 */
2095+
QUIRK_FLAG_GET_SAMPLE_RATE),
20882096
DEVICE_FLG(0x1395, 0x740a, /* Sennheiser DECT */
20892097
QUIRK_FLAG_GET_SAMPLE_RATE),
20902098
DEVICE_FLG(0x1397, 0x0507, /* Behringer UMC202HD */
@@ -2117,6 +2125,10 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
21172125
QUIRK_FLAG_ITF_USB_DSD_DAC | QUIRK_FLAG_CTL_MSG_DELAY),
21182126
DEVICE_FLG(0x1901, 0x0191, /* GE B850V3 CP2114 audio interface */
21192127
QUIRK_FLAG_GET_SAMPLE_RATE),
2128+
DEVICE_FLG(0x19f7, 0x0035, /* RODE NT-USB+ */
2129+
QUIRK_FLAG_GET_SAMPLE_RATE),
2130+
DEVICE_FLG(0x1bcf, 0x2283, /* NexiGo N930AF FHD Webcam */
2131+
QUIRK_FLAG_GET_SAMPLE_RATE),
21202132
DEVICE_FLG(0x2040, 0x7200, /* Hauppauge HVR-950Q */
21212133
QUIRK_FLAG_SHARE_MEDIA_DEVICE | QUIRK_FLAG_ALIGN_TRANSFER),
21222134
DEVICE_FLG(0x2040, 0x7201, /* Hauppauge HVR-950Q-MXL */
@@ -2159,6 +2171,12 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
21592171
QUIRK_FLAG_IGNORE_CTL_ERROR),
21602172
DEVICE_FLG(0x2912, 0x30c8, /* Audioengine D1 */
21612173
QUIRK_FLAG_GET_SAMPLE_RATE),
2174+
DEVICE_FLG(0x2b53, 0x0023, /* Fiero SC-01 (firmware v1.0.0 @ 48 kHz) */
2175+
QUIRK_FLAG_GENERIC_IMPLICIT_FB),
2176+
DEVICE_FLG(0x2b53, 0x0024, /* Fiero SC-01 (firmware v1.0.0 @ 96 kHz) */
2177+
QUIRK_FLAG_GENERIC_IMPLICIT_FB),
2178+
DEVICE_FLG(0x2b53, 0x0031, /* Fiero SC-01 (firmware v1.1.0) */
2179+
QUIRK_FLAG_GENERIC_IMPLICIT_FB),
21622180
DEVICE_FLG(0x30be, 0x0101, /* Schiit Hel */
21632181
QUIRK_FLAG_IGNORE_CTL_ERROR),
21642182
DEVICE_FLG(0x413c, 0xa506, /* Dell AE515 sound bar */
@@ -2167,24 +2185,6 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
21672185
QUIRK_FLAG_ALIGN_TRANSFER),
21682186
DEVICE_FLG(0x534d, 0x2109, /* MacroSilicon MS2109 */
21692187
QUIRK_FLAG_ALIGN_TRANSFER),
2170-
DEVICE_FLG(0x1224, 0x2a25, /* Jieli Technology USB PHY 2.0 */
2171-
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),
2178-
DEVICE_FLG(0x0525, 0xa4ad, /* Hamedal C20 usb camero */
2179-
QUIRK_FLAG_IFACE_SKIP_CLOSE),
2180-
DEVICE_FLG(0x0ecb, 0x205c, /* JBL Quantum610 Wireless */
2181-
QUIRK_FLAG_FIXED_RATE),
2182-
DEVICE_FLG(0x0ecb, 0x2069, /* JBL Quantum810 Wireless */
2183-
QUIRK_FLAG_FIXED_RATE),
2184-
DEVICE_FLG(0x1bcf, 0x2283, /* NexiGo N930AF FHD Webcam */
2185-
QUIRK_FLAG_GET_SAMPLE_RATE),
2186-
DEVICE_FLG(0x19f7, 0x0035, /* RODE NT-USB+ */
2187-
QUIRK_FLAG_GET_SAMPLE_RATE),
21882188

21892189
/* Vendor matches */
21902190
VENDOR_FLG(0x045e, /* MS Lifecam */

0 commit comments

Comments
 (0)