aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_codec.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-11-13 10:58:10 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-29 14:11:47 -0500
commit7088cd2da7489d71a6b5d569899f8af3f85247c4 (patch)
tree05f2f28e89b7e7ce93f9dc0b8b8971c38185085e /sound/pci/hda/hda_codec.c
parentb5c32fe75ce821a7a0ae1dd3f89c97f50a8a0304 (diff)
ALSA: hda - Don't clear the power state at snd_hda_codec_reset()
commit d183b4fc463489b6bbe05c99afa0257a6fe578eb upstream. 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. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
-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 31461ba32d3c..5b3d6614e66e 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -2517,9 +2517,6 @@ int snd_hda_codec_reset(struct hda_codec *codec)
2517 cancel_delayed_work_sync(&codec->jackpoll_work); 2517 cancel_delayed_work_sync(&codec->jackpoll_work);
2518#ifdef CONFIG_PM 2518#ifdef CONFIG_PM
2519 cancel_delayed_work_sync(&codec->power_work); 2519 cancel_delayed_work_sync(&codec->power_work);
2520 codec->power_on = 0;
2521 codec->power_transition = 0;
2522 codec->power_jiffies = jiffies;
2523 flush_workqueue(bus->workq); 2520 flush_workqueue(bus->workq);
2524#endif 2521#endif
2525 snd_hda_ctls_clear(codec); 2522 snd_hda_ctls_clear(codec);