usbaudio:fix suspend/resume
PATCH 1/2 usbaudio:fix suspend/resume
Quoted 1 line
From
0926f3aa059c42ccf096184654a9fb859c75f2e5Mon Sep 17 00:00:00 2001
From: Oliver Neukum <[email protected]>
Date: Fri, 11 Mar 2011 10:07:52 +0100
Subject: [PATCH 1/2] 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 <[email protected]>
--- sound/usb/card.c | 12 ++++++++++-- sound/usb/mixer.c | 26 ++++++++++++++++++++++++-- sound/usb/mixer.h | 2 ++ 3 files changed, 36 insertions(+), 4 deletions(-)
sound/usb/card.c +10 -2
@@ -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,9 +617,11 @@ 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 );return 0 ;
sound/usb/mixer.c +24 -2
@@ -2058,8 +2058,9 @@ static void snd_usb_mixer_interrupt(struct urb *urb) {struct usb_mixer_interface *mixer = urb->context;int len = urb->actual_length; +int ustatus = urb->status; -if (urb->status !=0 ) +if (ustatus !=0 ) goto requeue;if (mixer->protocol ==UAC_VERSION_1 ) {
@@ -2100,12 +2101,33 @@ static void snd_usb_mixer_interrupt(struct urb *urb) } requeue: -if (urb->status != -ENOENT && urb->status != -ECONNRESET ) { +if (ustatus != -ENOENT && ustatus != -ECONNRESET && ustatus != -ESHUTDOWN ) { urb->dev = mixer->chip->dev;usb_submit_urb (urb,GFP_ATOMIC ); } } +/* stop any bus activity of a mixer */ +void snd_usb_mixer_inactivate (struct usb_mixer_interface *mixer) +{ +usb_kill_urb (mixer->urb); +usb_kill_urb (mixer->rc_urb); +} + + +int snd_usb_mixer_activate (struct usb_mixer_interface *mixer) +{ +int err; + +if (mixer->urb) { + err =usb_submit_urb (mixer->urb,GFP_NOIO ); +if (err <0 ) +return err; + } + +return 0 ; +} +/* create the handler for the optional status interrupt endpoint */ static int snd_usb_mixer_status_create (struct usb_mixer_interface *mixer) {
sound/usb/mixer.h +2 -0
@@ -52,5 +52,7 @@ 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);#endif /* __USBMIXER_H */
Signature · 6 lines
1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html