summaryrefslogtreecommitdiffstats
path: root/sound/usb/card.c
diff options
context:
space:
mode:
authorOliver Neukum <oneukum@suse.de>2011-03-11 13:19:43 +0100
committerTakashi Iwai <tiwai@suse.de>2011-03-11 14:51:51 +0100
commitedf7de31c25ce72f163bf7d1fc0d2711869d073c (patch)
tree4b3b7946c6f97ebf9592d525fd1ce9e07fbb8148 /sound/usb/card.c
parentcc99a0861fa1c72335dc91a2e06d0b431911d55e (diff)
downloadlinux-edf7de31c25ce72f163bf7d1fc0d2711869d073c.tar.bz2
ALSA: usbaudio: fix suspend/resume
- ESHUTDOWN must be correctly handled - the optional interrupt endpoint's URB must be stopped and restarted Signed-off-by: Oliver Neukum <oneukum@suse.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/card.c')
-rw-r--r--sound/usb/card.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c
index c0f8270bc199..7fa53d91e73b 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -586,6 +586,7 @@ static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message)
struct snd_usb_audio *chip = usb_get_intfdata(intf);
struct list_head *p;
struct snd_usb_stream *as;
+ struct usb_mixer_interface *mixer;
if (chip == (void *)-1L)
return 0;
@@ -596,6 +597,10 @@ static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message)
as = list_entry(p, struct snd_usb_stream, list);
snd_pcm_suspend_all(as->pcm);
}
+
+ list_for_each_entry(mixer, &chip->mixer_list, list) {
+ snd_usb_mixer_inactivate(mixer);
+ }
}
return 0;
@@ -604,6 +609,7 @@ static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message)
static int usb_audio_resume(struct usb_interface *intf)
{
struct snd_usb_audio *chip = usb_get_intfdata(intf);
+ struct usb_mixer_interface *mixer;
if (chip == (void *)-1L)
return 0;
@@ -611,8 +617,10 @@ static int usb_audio_resume(struct usb_interface *intf)
return 0;
/*
* ALSA leaves material resumption to user space
- * we just notify
+ * we just notify and restart the mixers
*/
+ list_for_each_entry(mixer, &chip->mixer_list, list)
+ snd_usb_mixer_activate(mixer);
snd_power_change_state(chip->card, SNDRV_CTL_POWER_D0);