diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-11-05 13:03:12 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-11-05 13:03:12 +0100 |
| commit | b22b2e3d9413724c77acd64a97b0817fb767e7f9 (patch) | |
| tree | adf467da1c230e2939d99a3687a13e6849b17cd0 /sound/usb | |
| parent | ALSA: hda: Fix unused variable warning (diff) | |
| parent | ALSA: usb-audio: Add quirk for HP 320 FHD Webcam (diff) | |
| download | linux-b22b2e3d9413724c77acd64a97b0817fb767e7f9.tar.xz linux-b22b2e3d9413724c77acd64a97b0817fb767e7f9.zip | |
Merge branch 'for-linus' into for-next
Pull 6.12-devel branch for cleanup of USB-audio driver code.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/mixer.c | 1 | ||||
| -rw-r--r-- | sound/usb/mixer_quirks.c | 3 | ||||
| -rw-r--r-- | sound/usb/quirks.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index b6c3d2ee416e..341b32f5ddd0 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -1205,6 +1205,7 @@ static void volume_control_quirks(struct usb_mixer_elem_info *cval, } break; case USB_ID(0x1bcf, 0x2283): /* NexiGo N930AF FHD Webcam */ + case USB_ID(0x03f0, 0x654a): /* HP 320 FHD Webcam */ if (!strcmp(kctl->id.name, "Mic Capture Volume")) { usb_audio_info(chip, "set resolution quirk: cval->res = 16\n"); diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index 15c300eddf53..8bbf070b3676 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c @@ -4099,6 +4099,9 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) break; err = dell_dock_mixer_init(mixer); break; + case USB_ID(0x0bda, 0x402e): /* Dell WD19 dock */ + err = dell_dock_mixer_create(mixer); + break; case USB_ID(0x2a39, 0x3fd2): /* RME ADI-2 Pro */ case USB_ID(0x2a39, 0x3fd3): /* RME ADI-2 DAC */ diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index e6278a245795..c5fd180357d1 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -2114,6 +2114,8 @@ struct usb_audio_quirk_flags_table { static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { /* Device matches */ + DEVICE_FLG(0x03f0, 0x654a, /* HP 320 FHD Webcam */ + QUIRK_FLAG_GET_SAMPLE_RATE), DEVICE_FLG(0x041e, 0x3000, /* Creative SB Extigy */ QUIRK_FLAG_IGNORE_CTL_ERROR), DEVICE_FLG(0x041e, 0x4080, /* Creative Live Cam VF0610 */ |