mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +00:00
Revert "ALSA: hda - Shut up pins at power-saving mode with Conexnat codecs"
commit7ed4165e2d
upstream. This reverts commit697c373e34
. 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 <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Cc: Weng Meiling <wengmeiling.weng@huawei.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
4aab66f1da
commit
98a50ba04e
1 changed files with 0 additions and 16 deletions
|
@ -548,24 +548,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
|
||||
|
@ -4360,10 +4348,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,
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue