From mboxrd@z Thu Jan  1 00:00:00 1970
From: Takashi Iwai <tiwai@suse.de>
Subject: Re: [regression] Sound not transferred to docking
	station after resume from StR
Date: Mon, 19 Apr 2010 14:53:30 +0200
Message-ID: <s5hpr1vob79.wl%tiwai@suse.de>
References: <201004162131.19171.elendil@planet.nl>
	<s5h8w8jps9j.wl%tiwai@suse.de> <s5h633nprjy.wl%tiwai@suse.de>
	<201004191439.45589.elendil@planet.nl>
Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <alsa-devel-bounces@alsa-project.org>
Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15])
	by alsa0.perex.cz (Postfix) with ESMTP id 6FB6D246F9
	for <alsa-devel@alsa-project.org>;
	Mon, 19 Apr 2010 14:53:30 +0200 (CEST)
In-Reply-To: <201004191439.45589.elendil@planet.nl>
List-Unsubscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>,
	<mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe>
List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel>
List-Post: <mailto:alsa-devel@alsa-project.org>
List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help>
List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>,
	<mailto:alsa-devel-request@alsa-project.org?subject=subscribe>
Sender: alsa-devel-bounces@alsa-project.org
Errors-To: alsa-devel-bounces@alsa-project.org
To: Frans Pop <elendil@planet.nl>
Cc: linux-pm@lists.linux-foundation.org, linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org
List-Id: alsa-devel@alsa-project.org

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 <elendil@planet.nl>

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,
 };