summaryrefslogtreecommitdiffstats
path: root/sound/usb/mixer_quirks.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-08-22 15:44:45 +0200
committerTakashi Iwai <tiwai@suse.de>2017-08-22 15:44:45 +0200
commit241bc82e62b28fdb7223b85180fd814f4963c971 (patch)
treef0d1a3889fd027e017faa37fc34bffe2fa038c41 /sound/usb/mixer_quirks.c
parentALSA: firewire-motu: add support for MOTU Audio Express (diff)
parentALSA: core: Fix unexpected error at replacing user TLV (diff)
downloadlinux-241bc82e62b28fdb7223b85180fd814f4963c971.tar.xz
linux-241bc82e62b28fdb7223b85180fd814f4963c971.zip
Merge branch 'for-linus' into for-next
Conflicts: sound/core/control.c
Diffstat (limited to 'sound/usb/mixer_quirks.c')
-rw-r--r--sound/usb/mixer_quirks.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index e3d1dec48ee4..e1e7ce9ab217 100644
--- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c
@@ -1878,6 +1878,12 @@ void snd_usb_mixer_fu_apply_quirk(struct usb_mixer_interface *mixer,
if (unitid == 7 && cval->control == UAC_FU_VOLUME)
snd_dragonfly_quirk_db_scale(mixer, cval, kctl);
break;
+ /* lowest playback value is muted on C-Media devices */
+ case USB_ID(0x0d8c, 0x000c):
+ case USB_ID(0x0d8c, 0x0014):
+ if (strstr(kctl->id.name, "Playback"))
+ cval->min_mute = 1;
+ break;
}
}