Commit 5b7d898a authored by David Henningsson's avatar David Henningsson Committed by Ben Hutchings

Revert "ALSA: hda - Shut up pins at power-saving mode with Conexnat codecs"

commit 7ed4165e upstream.

This reverts commit 697c373e.

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/886975Signed-off-by: default avatarDavid Henningsson <david.henningsson@canonical.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent b60dc975
...@@ -592,24 +592,12 @@ static int conexant_build_controls(struct hda_codec *codec) ...@@ -592,24 +592,12 @@ static int conexant_build_controls(struct hda_codec *codec)
return 0; 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 = { static const struct hda_codec_ops conexant_patch_ops = {
.build_controls = conexant_build_controls, .build_controls = conexant_build_controls,
.build_pcms = conexant_build_pcms, .build_pcms = conexant_build_pcms,
.init = conexant_init, .init = conexant_init,
.free = conexant_free, .free = conexant_free,
.set_power_state = conexant_set_power, .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 #ifdef CONFIG_SND_HDA_INPUT_BEEP
...@@ -4429,10 +4417,6 @@ static const struct hda_codec_ops cx_auto_patch_ops = { ...@@ -4429,10 +4417,6 @@ static const struct hda_codec_ops cx_auto_patch_ops = {
.init = cx_auto_init, .init = cx_auto_init,
.free = conexant_free, .free = conexant_free,
.unsol_event = cx_auto_unsol_event, .unsol_event = cx_auto_unsol_event,
#ifdef CONFIG_SND_HDA_POWER_SAVE
.suspend = conexant_suspend,
#endif
.reboot_notify = snd_hda_shutup_pins,
}; };
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment