Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751741AbaDTGI2 (ORCPT ); Sun, 20 Apr 2014 02:08:28 -0400 Received: from cantor2.suse.de ([195.135.220.15]:39127 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751044AbaDTGIT (ORCPT ); Sun, 20 Apr 2014 02:08:19 -0400 Date: Sun, 20 Apr 2014 08:08:18 +0200 Message-ID: From: Takashi Iwai To: Bryan Quigley Cc: linux-kernel@vger.kernel.org Subject: Re: PROBLEM: Pulseaudio hung at schedule in 3.15-rc1 In-Reply-To: References: User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At Sat, 19 Apr 2014 13:20:01 -0400, Bryan Quigley wrote: > > 400362f1d8dcfda3562e80e88cfc2a92cffaf9bf is the first bad commit > commit 400362f1d8dcfda3562e80e88cfc2a92cffaf9bf > Author: Takashi Iwai > 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/