diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-06-20 14:43:20 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-06-20 14:43:20 +0200 |
| commit | 1ade819181e9b4ab4de1ab0ac0b865d946fefc17 (patch) | |
| tree | 9d724917503c0db204048ad68928f00be965e1c0 /sound/pci/hda/hda_codec.h | |
| parent | ALSA: hda - Add missing snd_hda_jack_detect_enable() for simple_hdmi*() (diff) | |
| parent | ALSA: hda - Handle open while transitioning to D3. (diff) | |
| download | linux-1ade819181e9b4ab4de1ab0ac0b865d946fefc17.tar.xz linux-1ade819181e9b4ab4de1ab0ac0b865d946fefc17.zip | |
Merge branch 'fix/hda' into topic/hda
The fix for power sequence needs to be merged back to topic branch.
Diffstat (limited to 'sound/pci/hda/hda_codec.h')
| -rw-r--r-- | sound/pci/hda/hda_codec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 71864cddcb9d..a4ac1de7aa19 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -1059,10 +1059,12 @@ const char *snd_hda_get_jack_location(u32 cfg); */ #ifdef CONFIG_SND_HDA_POWER_SAVE void snd_hda_power_up(struct hda_codec *codec); +void snd_hda_power_up_d3wait(struct hda_codec *codec); void snd_hda_power_down(struct hda_codec *codec); void snd_hda_update_power_acct(struct hda_codec *codec); #else static inline void snd_hda_power_up(struct hda_codec *codec) {} +static inline void snd_hda_power_up_d3wait(struct hda_codec *codec) {} static inline void snd_hda_power_down(struct hda_codec *codec) {} #endif |