Re: PROBLEM: Pulseaudio hung at schedule in 3.15-rc1

[Takashi Iwai]

At Sat, 19 Apr 2014 13:20:01 -0400,
Bryan Quigley wrote:
> 
> 400362f1d8dcfda3562e80e88cfc2a92cffaf9bf is the first bad commit
> commit 400362f1d8dcfda3562e80e88cfc2a92cffaf9bf
> Author: Takashi Iwai <tiwai@xxxxxxx>
> Date:   Mon Jan 20 16:51:16 2014 +0100
> 
>     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.
> 
> Confirmed that a revert of that commit only fixes the issue.

Does the patch below work?  I'm on vacation now, so the reply may be
delayed.


thanks,

Takashi

---
diff --git a/sound/usb/card.c b/sound/usb/card.c
index 893d5a1..d26fd9b 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -711,6 +711,7 @@ static int __usb_audio_resume(struct usb_interface *intf, bool reset_resume)
 		return 0;
 	if (--chip->num_suspended_intf)
 		return 0;
+	usb_autopm_get_interface_no_resume(chip->pm_intf);
 	/*
 	 * ALSA leaves material resumption to user space
 	 * we just notify and restart the mixers
@@ -726,6 +727,7 @@ static int __usb_audio_resume(struct usb_interface *intf, bool reset_resume)
 	chip->autosuspended = 0;
 
 err_out:
+	usb_autopm_put_interface(chip->pm_intf);
 	return err;
 }
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/