aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-11-13 10:58:10 -0500
committerTakashi Iwai <tiwai@suse.de>2013-11-13 11:02:30 -0500
commitd183b4fc463489b6bbe05c99afa0257a6fe578eb (patch)
tree5c53e12db07a54e5f85ff4cfbf00431093484185 /sound
parentf710a9fbd3a894be5706956cd619b369f5acc474 (diff)
ALSA: hda - Don't clear the power state at snd_hda_codec_reset()
snd_hda_codec_reset() is called either in resetting the whole setup at error paths or hwdep clear/reconfig sysfs triggers. But all of these don't assume that the power has to be off, rather they want to keep the power state unchanged (e.g. reconfig_codec() calls the power up/down by itself). Thus, unconditionally clearing the power state in snd_hda_codec_reset() leads to the inconsistency, confuses the further operation. This patch gets rid of the lines doing that bad thing. Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_codec.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index dd5403d40830..afb90f48867f 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -2579,9 +2579,6 @@ int snd_hda_codec_reset(struct hda_codec *codec)
2579 cancel_delayed_work_sync(&codec->jackpoll_work); 2579 cancel_delayed_work_sync(&codec->jackpoll_work);
2580#ifdef CONFIG_PM 2580#ifdef CONFIG_PM
2581 cancel_delayed_work_sync(&codec->power_work); 2581 cancel_delayed_work_sync(&codec->power_work);
2582 codec->power_on = 0;
2583 codec->power_transition = 0;
2584 codec->power_jiffies = jiffies;
2585 flush_workqueue(bus->workq); 2582 flush_workqueue(bus->workq);
2586#endif 2583#endif
2587 snd_hda_ctls_clear(codec); 2584 snd_hda_ctls_clear(codec);