summaryrefslogtreecommitdiffstats
path: root/sound/usb/mixer.c
diff options
context:
space:
mode:
authorTakashi Iwai2018-04-27 14:23:37 +0200
committerTakashi Iwai2018-05-02 16:02:32 +0200
commit964af639ad699404cbe36d0c1fc85970700e6107 (patch)
treeab5b7731f63449b7892bcd476f5174b80c5dd314 /sound/usb/mixer.c
parentALSA: dice: remove local frag of force_two_pcms (diff)
downloadkernel-qcow2-linux-964af639ad699404cbe36d0c1fc85970700e6107.tar.gz
kernel-qcow2-linux-964af639ad699404cbe36d0c1fc85970700e6107.tar.xz
kernel-qcow2-linux-964af639ad699404cbe36d0c1fc85970700e6107.zip
ALSA: usb-audio: Initialize Dell Dock playback volumes
In the early commit adcdd0d5a1cb ("ALSA: usb-audio: Skip volume controls triggers hangup on Dell USB Dock"), we add the mixer quirks for Dell dock to skip two mixer FU's for playback. This supposed that the device has always the proper initial volume, but it doesn't seem always correct. This patch adds the explicit initialization of the volumes to the fixed 0dB at the device probe time. Also, such a fixup is needed after the resume, so a new function is hooked to the resume callback as well. Bugzilla: http://bugzilla.suse.com/show_bug.cgi?id=1089467 Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/mixer.c')
-rw-r--r--sound/usb/mixer.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 344d7b069d59..76fabc4b72b5 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -2948,6 +2948,8 @@ int snd_usb_mixer_resume(struct usb_mixer_interface *mixer, bool reset_resume)
}
}
+ snd_usb_mixer_resume_quirk(mixer);
+
return snd_usb_mixer_activate(mixer);
}
#endif