Attachment #298297 for bug #214045





static void hda_codec_driver_shutdown(struct device *dev)
{
	snd_hda_codec_shutdown(dev_to_hda_codec(dev));

	if (!pm_runtime_suspended(dev)) {
		if (codec->patch_ops.reboot_notify)
			codec->patch_ops.reboot_notify(codec);
		snd_hda_codec_display_power(codec, false);
	}
}

int __hda_codec_driver_register(struct hda_codec_driver *drv, const char *name,




			   NULL)
};

/* suspend the codec at shutdown; called from driver's shutdown callback */
void snd_hda_codec_shutdown(struct hda_codec *codec)
{
	struct hda_pcm *cpcm;

	if (pm_runtime_suspended(hda_codec_dev(codec)))
		return;

	list_for_each_entry(cpcm, &codec->pcm_list_head, list)
		snd_pcm_suspend_all(cpcm->pcm);

	pm_runtime_suspend(hda_codec_dev(codec));
}

/*
 * add standard channel maps if not specified
 */

Lines 615-620 unsigned int snd_hda_codec_eapd_power_filter(struct hda_codec *codec, Link Here

(-)a/sound/pci/hda/hda_local.h (-1 / +2 lines)
615	hda_nid_t nid,	615	hda_nid_t nid,
616	unsigned int power_state);	616	unsigned int power_state);
617		617
		618	void snd_hda_codec_shutdown(struct hda_codec *codec);
		619
618	/*	620	/*
619	* AMP control callbacks	621	* AMP control callbacks
620	*/	622	*/
621	-

Return to bug 214045

Lines 165-177 static int hda_codec_driver_remove(struct device *dev) Link Here

(-)a/sound/pci/hda/hda_bind.c (-7 / +1 lines)
165		165
166	static void hda_codec_driver_shutdown(struct device *dev)	166	static void hda_codec_driver_shutdown(struct device *dev)
167	{	167	{
168	struct hda_codec *codec = dev_to_hda_codec(dev);	168	snd_hda_codec_shutdown(dev_to_hda_codec(dev));
169
170	if (!pm_runtime_suspended(dev)) {
171	if (codec->patch_ops.reboot_notify)
172	codec->patch_ops.reboot_notify(codec);
173	snd_hda_codec_display_power(codec, false);
174	}
175	}	169	}
176		170
177	int __hda_codec_driver_register(struct hda_codec_driver drv, const char name,	171	int __hda_codec_driver_register(struct hda_codec_driver drv, const char name,

Lines 2981-2986 const struct dev_pm_ops hda_codec_driver_pm = { Link Here

(-)a/sound/pci/hda/hda_codec.c (+14 lines)
2981	NULL)	2981	NULL)
2982	};	2982	};
2983		2983
		2984	/* suspend the codec at shutdown; called from driver's shutdown callback */
		2985	void snd_hda_codec_shutdown(struct hda_codec *codec)
		2986	{
		2987	struct hda_pcm *cpcm;
		2988
		2989	if (pm_runtime_suspended(hda_codec_dev(codec)))
		2990	return;
		2991
		2992	list_for_each_entry(cpcm, &codec->pcm_list_head, list)
		2993	snd_pcm_suspend_all(cpcm->pcm);
		2994
		2995	pm_runtime_suspend(hda_codec_dev(codec));
		2996	}
		2997
2984	/*	2998	/*
2985	* add standard channel maps if not specified	2999	* add standard channel maps if not specified
2986	*/	3000	*/