Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ed4165e authored by David Henningsson's avatar David Henningsson Committed by Takashi Iwai
Browse files

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

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/886975


Signed-off-by: default avatarDavid Henningsson <david.henningsson@canonical.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d7dab4db

sound/pci/hda/patch_conexant.c

+0 −16
Original line number Original line Diff line number Diff line
@@ -558,24 +558,12 @@ static int conexant_build_controls(struct hda_codec *codec) 
	return 0;

	return 0;

}

}





#ifdef CONFIG_PM

static int conexant_suspend(struct hda_codec *codec)

{

	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_PM

	.suspend = conexant_suspend,

#endif

	.reboot_notify = snd_hda_shutup_pins,

};

};





#ifdef CONFIG_SND_HDA_INPUT_BEEP

#ifdef CONFIG_SND_HDA_INPUT_BEEP
@@ -4405,10 +4393,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 = snd_hda_jack_unsol_event,

	.unsol_event = snd_hda_jack_unsol_event,

#ifdef CONFIG_PM

	.suspend = conexant_suspend,

#endif

	.reboot_notify = snd_hda_shutup_pins,

};

};





/*

/*