aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-04-26 09:18:33 -0400
committerTakashi Iwai <tiwai@suse.de>2011-04-26 09:18:33 -0400
commit0da2692256ed65bec588f7797c77f9c84ef4274e (patch)
tree97a6cb62917eee8df0b681dfb8481b18be65c02e
parent31d44b57c508971c083ce038d7c5ededd09cea01 (diff)
ALSA: hda - Move EAPD power-down into shutup callback for AD codecs
EAPD power-down should be called also for normal shutup cases. Let's move to there. This also fixes the compile warnings when CONFIG_PM isn't set automatically. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/patch_analog.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 2942d2a9ea1..12317488cd9 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -489,11 +489,6 @@ static int ad198x_build_pcms(struct hda_codec *codec)
489 return 0; 489 return 0;
490} 490}
491 491
492static inline void ad198x_shutup(struct hda_codec *codec)
493{
494 snd_hda_shutup_pins(codec);
495}
496
497static void ad198x_free_kctls(struct hda_codec *codec) 492static void ad198x_free_kctls(struct hda_codec *codec)
498{ 493{
499 struct ad198x_spec *spec = codec->spec; 494 struct ad198x_spec *spec = codec->spec;
@@ -547,6 +542,12 @@ static void ad198x_power_eapd(struct hda_codec *codec)
547 } 542 }
548} 543}
549 544
545static void ad198x_shutup(struct hda_codec *codec)
546{
547 snd_hda_shutup_pins(codec);
548 ad198x_power_eapd(codec);
549}
550
550static void ad198x_free(struct hda_codec *codec) 551static void ad198x_free(struct hda_codec *codec)
551{ 552{
552 struct ad198x_spec *spec = codec->spec; 553 struct ad198x_spec *spec = codec->spec;
@@ -564,7 +565,6 @@ static void ad198x_free(struct hda_codec *codec)
564static int ad198x_suspend(struct hda_codec *codec, pm_message_t state) 565static int ad198x_suspend(struct hda_codec *codec, pm_message_t state)
565{ 566{
566 ad198x_shutup(codec); 567 ad198x_shutup(codec);
567 ad198x_power_eapd(codec);
568 return 0; 568 return 0;
569} 569}
570#endif 570#endif