]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
ALSA: usb-audio: Save mixer status only once at suspend
authorTakashi Iwai <tiwai@suse.de>
Fri, 2 May 2014 16:14:42 +0000 (18:14 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 2 May 2014 16:14:42 +0000 (18:14 +0200)
The suspend callback of usb-audio driver may be called multiple times
per suspend when multiple USB interfaces are bound to a single sound
card instance.  In such a case, it's superfluous to save the mixer
values multiple times.  This patch fixes it by checking the counter.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/usb/card.c

index 893d5a1afc3ce6bf854a61ef0c3f4f54cc552d0d..e769d39777164f8d898991f3b3d7b005102c3bf8 100644 (file)
@@ -695,8 +695,9 @@ static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message)
                        chip->autosuspended = 1;
        }
 
-       list_for_each_entry(mixer, &chip->mixer_list, list)
-               snd_usb_mixer_suspend(mixer);
+       if (chip->num_suspended_intf == 1)
+               list_for_each_entry(mixer, &chip->mixer_list, list)
+                       snd_usb_mixer_suspend(mixer);
 
        return 0;
 }