From patchwork Wed Jan 23 04:43:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3.5.y.z, extended, stable] Patch "Revert "ALSA: hda - Shut up pins at power-saving mode with" has been added to staging queue Date: Tue, 22 Jan 2013 18:43:06 -0000 From: Herton Ronaldo Krzesinski X-Patchwork-Id: 214756 Message-Id: <1358916186-23208-1-git-send-email-herton.krzesinski@canonical.com> To: David Henningsson Cc: Takashi Iwai , kernel-team@lists.ubuntu.com This is a note to let you know that I have just added a patch titled Revert "ALSA: hda - Shut up pins at power-saving mode with to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.5.y.z tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Herton ------ >From 8d55376aba18ff33f39fce85e990a458a7d820ca Mon Sep 17 00:00:00 2001 From: David Henningsson Date: Wed, 19 Dec 2012 09:44:47 +0100 Subject: [PATCH] Revert "ALSA: hda - Shut up pins at power-saving mode with Conexnat codecs" commit 7ed4165e2d01bdbbb4c1086eb73eadf0f64cbbf0 upstream. This reverts commit 697c373e34613609cb5450f98b91fefb6e910588. The original patch was meant to remove clicking, but in fact caused even more clicking instead. Thanks to c4pp4 for doing most of the work with this bug. BugLink: https://bugs.launchpad.net/bugs/886975 Signed-off-by: David Henningsson Signed-off-by: Takashi Iwai [ herton: s/CONFIG_PM/CONFIG_SND_HDA_POWER_SAVE/, adjust context ] Signed-off-by: Herton Ronaldo Krzesinski --- sound/pci/hda/patch_conexant.c | 16 ---------------- 1 file changed, 16 deletions(-) -- 1.7.9.5 diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 808d5fd..908fc7f 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -553,24 +553,12 @@ static int conexant_build_controls(struct hda_codec *codec) return 0; } -#ifdef CONFIG_SND_HDA_POWER_SAVE -static int conexant_suspend(struct hda_codec *codec, pm_message_t state) -{ - snd_hda_shutup_pins(codec); - return 0; -} -#endif - static const struct hda_codec_ops conexant_patch_ops = { .build_controls = conexant_build_controls, .build_pcms = conexant_build_pcms, .init = conexant_init, .free = conexant_free, .set_power_state = conexant_set_power, -#ifdef CONFIG_SND_HDA_POWER_SAVE - .suspend = conexant_suspend, -#endif - .reboot_notify = snd_hda_shutup_pins, }; #ifdef CONFIG_SND_HDA_INPUT_BEEP @@ -4401,10 +4389,6 @@ static const struct hda_codec_ops cx_auto_patch_ops = { .init = cx_auto_init, .free = conexant_free, .unsol_event = cx_auto_unsol_event, -#ifdef CONFIG_SND_HDA_POWER_SAVE - .suspend = conexant_suspend, -#endif - .reboot_notify = snd_hda_shutup_pins, }; /*