In message: [linux-yocto] ALSA: usb-audio: Remove duplicated quirk table entries on 21/02/2024 Kevin Hao wrote:
> From: Kevin Hao <[email protected]> > > The merge commit 7104a5aa5d2a ("Merge branch 'v6.1/standard/base' into > v6.1/standard/bcm-2xxx-rpi") left some duplicated quirk table entries > when fixing merge conflicts. Remove them and also shuffle some entries > to sort them in USB ID order as what it does in stable commit > 7b430fb92440 ("ALSA: usb-audio: Sort quirk table entries"). > > Signed-off-by: Kevin Hao <[email protected]> > --- > Hi Bruce, > > Please help me merge this onto the following two branches: > v6.1/standard/bcm-2xxx-rpi > v6.1/standard/preempt-rt/bcm-2xxx-rpi Argh. I thought I had duplicated some and did a quick scan, but yet missed seeing the issue. This is now merged. Bruce > > sound/usb/quirks.c | 21 +++------------------ > 1 file changed, 3 insertions(+), 18 deletions(-) > > diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c > index 555174c686ae..fc6c8e171587 100644 > --- a/sound/usb/quirks.c > +++ b/sound/usb/quirks.c > @@ -2081,6 +2081,8 @@ static const struct usb_audio_quirk_flags_table > quirk_flags_table[] = { > QUIRK_FLAG_IGNORE_CTL_ERROR), > DEVICE_FLG(0x0951, 0x16ad, /* Kingston HyperX */ > QUIRK_FLAG_CTL_MSG_DELAY_1M), > + DEVICE_FLG(0x09da, 0x2695, /* A4Tech FHD 1080p webcam */ > + QUIRK_FLAG_DISABLE_AUTOSUSPEND | QUIRK_FLAG_GET_SAMPLE_RATE), > DEVICE_FLG(0x0b0e, 0x0349, /* Jabra 550a */ > QUIRK_FLAG_CTL_MSG_DELAY_1M), > DEVICE_FLG(0x0ecb, 0x205c, /* JBL Quantum610 Wireless */ > @@ -2183,24 +2185,7 @@ static const struct usb_audio_quirk_flags_table > quirk_flags_table[] = { > QUIRK_FLAG_ALIGN_TRANSFER), > DEVICE_FLG(0x534d, 0x2109, /* MacroSilicon MS2109 */ > QUIRK_FLAG_ALIGN_TRANSFER), > - DEVICE_FLG(0x1224, 0x2a25, /* Jieli Technology USB PHY 2.0 */ > - QUIRK_FLAG_GET_SAMPLE_RATE), > - DEVICE_FLG(0x2b53, 0x0023, /* Fiero SC-01 (firmware v1.0.0 @ 48 kHz) */ > - QUIRK_FLAG_GENERIC_IMPLICIT_FB), > - DEVICE_FLG(0x2b53, 0x0024, /* Fiero SC-01 (firmware v1.0.0 @ 96 kHz) */ > - QUIRK_FLAG_GENERIC_IMPLICIT_FB), > - DEVICE_FLG(0x2b53, 0x0031, /* Fiero SC-01 (firmware v1.1.0) */ > - QUIRK_FLAG_GENERIC_IMPLICIT_FB), > - DEVICE_FLG(0x0525, 0xa4ad, /* Hamedal C20 usb camero */ > - QUIRK_FLAG_IFACE_SKIP_CLOSE), > - DEVICE_FLG(0x0ecb, 0x205c, /* JBL Quantum610 Wireless */ > - QUIRK_FLAG_FIXED_RATE), > - DEVICE_FLG(0x0ecb, 0x2069, /* JBL Quantum810 Wireless */ > - QUIRK_FLAG_FIXED_RATE), > - DEVICE_FLG(0x09da, 0x2695, /* A4Tech FHD 1080p webcam */ > - QUIRK_FLAG_DISABLE_AUTOSUSPEND | QUIRK_FLAG_GET_SAMPLE_RATE), > - DEVICE_FLG(0x1bcf, 0x2283, /* NexiGo N930AF FHD Webcam */ > - QUIRK_FLAG_GET_SAMPLE_RATE), > + > /* Vendor matches */ > VENDOR_FLG(0x045e, /* MS Lifecam */ > QUIRK_FLAG_GET_SAMPLE_RATE), > -- > 2.40.1 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13597): https://lists.yoctoproject.org/g/linux-yocto/message/13597 Mute This Topic: https://lists.yoctoproject.org/mt/104482068/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
