Revert "ALSA: hda - Set codec to D3 forcibly even if not used"
authorTakashi Iwai <tiwai@suse.de>
Fri, 18 May 2012 10:36:12 +0000 (15:36 +0530)
committerVarun Wadekar <vwadekar@nvidia.com>
Fri, 18 May 2012 10:36:12 +0000 (15:36 +0530)
commit06f64e34ec1d48b183598e668fe549a5319e87cd
tree8099def916681b9e08c7a2e5200b372b1a600fe8
parent0bddcaa44273bc0259a23a2362f5d427c7d277d5
Revert "ALSA: hda - Set codec to D3 forcibly even if not used"

This reverts commit 785f857d1cb0856b612b46a0545b74aa2596e44a.

The commit causes a problem with the wrong D3 state after suspend
because the call of hda_set_power_state() involves with the power-up
sequence, which changes the power_count, and this confuses the resume
sequence that checks the power_count as well.

Originally, this go-to-D3 sequence should be a simple task without the
power-up sequence.  But, it'd need some proper sanity checks in the
case of power-saved state, so it's not too easy to write now in the
3.4-rc cycle.

In short, the safest option now is to revert this affecting commit.

Of course, we need to clean up and robustify the power-saving code
better for 3.5 kernel.

Reported-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Conflicts:

sound/pci/hda/hda_intel.c

Change-Id: I9b677120adc4b281f82b595a85efb4e052410dfe
sound/pci/hda/hda_codec.c
sound/pci/hda/hda_intel.c