summaryrefslogtreecommitdiffstats
path: root/sound/usb/mixer.c
diff options
context:
space:
mode:
authorTakashi Iwai2018-05-15 07:30:23 +0200
committerTakashi Iwai2018-05-15 07:30:23 +0200
commit8def12d9cd45b6abad87c5dc5a88a18c739762be (patch)
tree232020665442fb2c8bd55f4878c1735535dfd8a7 /sound/usb/mixer.c
parentALSA: hda/ca0132: fix array_size.cocci warnings (diff)
parentALSA: usb-audio: Use Class Specific EP for UAC3 devices. (diff)
downloadkernel-qcow2-linux-8def12d9cd45b6abad87c5dc5a88a18c739762be.tar.gz
kernel-qcow2-linux-8def12d9cd45b6abad87c5dc5a88a18c739762be.tar.xz
kernel-qcow2-linux-8def12d9cd45b6abad87c5dc5a88a18c739762be.zip
Merge branch 'for-linus' into for-next
Back-merge of UAC3 fixes for applying further enhancements. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/mixer.c')
-rw-r--r--sound/usb/mixer.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 4987982250d5..173979e05e63 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -965,6 +965,14 @@ static void volume_control_quirks(struct usb_mixer_elem_info *cval,
}
break;
+ case USB_ID(0x0d8c, 0x0103):
+ if (!strcmp(kctl->id.name, "PCM Playback Volume")) {
+ usb_audio_info(chip,
+ "set volume quirk for CM102-A+/102S+\n");
+ cval->min = -256;
+ }
+ break;
+
case USB_ID(0x0471, 0x0101):
case USB_ID(0x0471, 0x0104):
case USB_ID(0x0471, 0x0105):