ALSA: usb-audio: Resume mixer values properly
PATCH 1/1 ALSA: usb-audio: Resume mixer values properly
Implement reset_resume callback so that the mixer values are properly restored. Still no boot quirks are called, so it might not work well on some devices.
Signed-off-by Takashi Iwai <[email protected]>
--- sound/usb/card.c | 18 ++++++++-- sound/usb/mixer.c | 99 ++++++++++++++++++++++++++++++++++++++++++++----------- sound/usb/mixer.h | 7 ++-- 3 files changed, 99 insertions(+), 25 deletions(-)
sound/usb/card.c +15 -3
@@ -691,12 +691,12 @@ static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message) }list_for_each_entry (mixer, &chip->mixer_list, list) -snd_usb_mixer_inactivate (mixer); +snd_usb_mixer_suspend (mixer);return 0 ; } -static int usb_audio_resume (struct usb_interface *intf) +static int __usb_audio_resume (struct usb_interface *intf,bool reset_resume) {struct snd_usb_audio *chip =usb_get_intfdata (intf);struct usb_mixer_interface *mixer;
@@ -711,7 +711,7 @@ static int usb_audio_resume(struct usb_interface *intf)* we just notify and restart the mixers */ list_for_each_entry (mixer, &chip->mixer_list, list) { - err =snd_usb_mixer_activate (mixer); + err =snd_usb_mixer_resume (mixer, reset_resume);if (err <0 ) goto err_out; }
@@ -723,9 +723,20 @@ static int usb_audio_resume(struct usb_interface *intf) err_out:return err; } + +static int usb_audio_resume (struct usb_interface *intf) +{ +return __usb_audio_resume (intf, false); +} + +static int usb_audio_reset_resume (struct usb_interface *intf) +{ +return __usb_audio_resume (intf, true); +}#else #define usb_audio_suspend NULL#define usb_audio_resume NULL +#define usb_audio_reset_resume NULL#endif /* CONFIG_PM */ static struct usb_device_id usb_audio_ids [] = {
@@ -747,6 +758,7 @@ static struct usb_driver usb_audio_driver = { .disconnect = usb_audio_disconnect, .suspend = usb_audio_suspend, .resume = usb_audio_resume, + .reset_resume = usb_audio_reset_resume, .id_table = usb_audio_ids, .supports_autosuspend = 1, };
sound/usb/mixer.c +79 -20
108 lines not on this page · raw message
sound/usb/mixer.h +5 -2
@@ -63,8 +63,6 @@ void snd_usb_mixer_notify_id(struct usb_mixer_interface *mixer, int unitid);int snd_usb_mixer_set_ctl_value (struct usb_mixer_elem_info *cval,int request,int validx,int value_set); -void snd_usb_mixer_inactivate (struct usb_mixer_interface *mixer); -int snd_usb_mixer_activate (struct usb_mixer_interface *mixer);int snd_usb_mixer_add_control (struct usb_mixer_interface *mixer,struct snd_kcontrol *kctl);
@@ -72,4 +70,9 @@ int snd_usb_mixer_add_control(struct usb_mixer_interface *mixer,int snd_usb_mixer_vol_tlv (struct snd_kcontrol *kcontrol,int op_flag,unsigned int size,unsigned int __user *_tlv); +#ifdef CONFIG_PM +int snd_usb_mixer_suspend (struct usb_mixer_interface *mixer); +int snd_usb_mixer_resume (struct usb_mixer_interface *mixer,bool reset_resume); +#endif +#endif /* __USBMIXER_H */
Signature · 1 line
1.8.5.2