Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754861Ab0DSMxc (ORCPT ); Mon, 19 Apr 2010 08:53:32 -0400 Received: from cantor2.suse.de ([195.135.220.15]:48978 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754830Ab0DSMxb (ORCPT ); Mon, 19 Apr 2010 08:53:31 -0400 Date: Mon, 19 Apr 2010 14:53:30 +0200 Message-ID: From: Takashi Iwai To: Frans Pop Cc: linux-kernel@vger.kernel.org, linux-pm@lists.linux-foundation.org, alsa-devel@alsa-project.org Subject: Re: [regression] Sound not transferred to docking station after resume from StR In-Reply-To: <201004191439.45589.elendil@planet.nl> References: <201004162131.19171.elendil@planet.nl> <201004191439.45589.elendil@planet.nl> User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.1 (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 Content-Length: 1419 Lines: 55 At Mon, 19 Apr 2010 14:39:44 +0200, Frans Pop wrote: > > On Monday 19 April 2010, Takashi Iwai wrote: > > Or how about the patch below? > > That fixes the problem too. > > Please add my: > Reported-and-tested-by: Frans Pop Thanks for a quick check. But I found that the patch isn't fully correct. The patch below should suffice instead of the previous one. Could you check it again? thanks, Takashi --- diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index 9cbd80c..afbe314 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c @@ -527,14 +527,6 @@ static int ad198x_suspend(struct hda_codec *codec, pm_message_t state) ad198x_power_eapd(codec); return 0; } - -static int ad198x_resume(struct hda_codec *codec) -{ - ad198x_init(codec); - snd_hda_codec_resume_amp(codec); - snd_hda_codec_resume_cache(codec); - return 0; -} #endif static struct hda_codec_ops ad198x_patch_ops = { @@ -547,7 +539,6 @@ static struct hda_codec_ops ad198x_patch_ops = { #endif #ifdef SND_HDA_NEEDS_RESUME .suspend = ad198x_suspend, - .resume = ad198x_resume, #endif .reboot_notify = ad198x_shutup, }; -- 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/